]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'AUTHDIR_NEWDESC_enough_squashed'
authorNick Mathewson <nickm@torproject.org>
Thu, 19 Feb 2015 16:35:32 +0000 (11:35 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 19 Feb 2015 16:35:32 +0000 (11:35 -0500)

Trivial merge