]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e57cb6b de75afc)
Merge remote branch 'rransom/fix2195-fix' into maint-0.2.2
authorNick Mathewson <nickm@torproject.org>
Wed, 24 Nov 2010 22:02:22 +0000 (17:02 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 24 Nov 2010 22:02:22 +0000 (17:02 -0500)

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