]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dd22ab5 39a0178)
Merge remote-tracking branch 'andrea/bug12160_025' into maint-0.2.5
authorNick Mathewson <nickm@torproject.org>
Tue, 9 Sep 2014 15:04:54 +0000 (11:04 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 9 Sep 2014 15:04:54 +0000 (11:04 -0400)

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