]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1adc2bf ae22313)
Merge branch 'maint-0.2.5' into maint-0.2.6
authorNick Mathewson <nickm@torproject.org>
Thu, 7 Jan 2016 17:14:05 +0000 (09:14 -0800)
committerNick Mathewson <nickm@torproject.org>
Thu, 7 Jan 2016 17:14:05 +0000 (09:14 -0800)

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