]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c8e1538 dfe8c21)
Merge remote branch 'mikeperry/bug1952-merge' into maint-0.2.2
authorNick Mathewson <nickm@torproject.org>
Mon, 27 Sep 2010 16:17:41 +0000 (12:17 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 27 Sep 2010 16:17:41 +0000 (12:17 -0400)

Trivial merge
Mirror of https://git.torproject.org/tor.git