]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 39ef343 3833f67)
Merge branch 'maint-0.2.4' into maint-0.2.5
authorNick Mathewson <nickm@torproject.org>
Wed, 11 Jan 2017 14:11:58 +0000 (09:11 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 11 Jan 2017 14:11:58 +0000 (09:11 -0500)

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