]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8e61d38 9052874)
Merge remote-tracking branch 'public/bug14129_024' into maint-0.2.4
authorNick Mathewson <nickm@torproject.org>
Tue, 24 Feb 2015 18:23:44 +0000 (13:23 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 24 Feb 2015 18:23:44 +0000 (13:23 -0500)

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