]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fec73c8 51e3602)
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
authorNick Mathewson <nickm@torproject.org>
Tue, 24 Feb 2015 18:25:32 +0000 (13:25 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 24 Feb 2015 18:25:32 +0000 (13:25 -0500)

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