]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9969b0d 82f8b27)
Merge branch 'maint-0.2.5' into maint-0.2.8
authorNick Mathewson <nickm@torproject.org>
Wed, 25 Oct 2017 13:28:15 +0000 (09:28 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 25 Oct 2017 13:28:15 +0000 (09:28 -0400)
"ours" merge to avoid version bump


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