]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d1dc23c 74f5e30)
Merge remote-tracking branch 'desoxy/bug-8596' into maint-0.2.4
authorNick Mathewson <nickm@torproject.org>
Fri, 5 Apr 2013 20:57:53 +0000 (16:57 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 5 Apr 2013 20:57:53 +0000 (16:57 -0400)

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