]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8f858de 162a087)
Merge branch 'maint-0.2.5' into maint-0.2.8
authorNick Mathewson <nickm@torproject.org>
Fri, 1 Dec 2017 14:34:47 +0000 (09:34 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 1 Dec 2017 14:34:47 +0000 (09:34 -0500)
"ours" merge to avoid version bump.


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