]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4a6f5bb 7a878c1)
Merge remote-tracking branch 'arma/bug12996b' into maint-0.2.5
authorNick Mathewson <nickm@torproject.org>
Fri, 29 Aug 2014 20:44:50 +0000 (16:44 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 29 Aug 2014 20:44:50 +0000 (16:44 -0400)

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