]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'bug13762_quiet_squashed'
authorNick Mathewson <nickm@torproject.org>
Thu, 19 Feb 2015 14:40:41 +0000 (09:40 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 19 Feb 2015 14:40:41 +0000 (09:40 -0500)

Trivial merge