]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'microdesc-use-v2-squashed'
authorNick Mathewson <nickm@torproject.org>
Fri, 6 May 2011 01:01:03 +0000 (21:01 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 6 May 2011 01:01:03 +0000 (21:01 -0400)

Trivial merge