]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ba4a9cf 6bda677)
Merge branch 'maint-0.2.5' into maint-0.2.8
authorNick Mathewson <nickm@torproject.org>
Thu, 30 Nov 2017 17:21:36 +0000 (12:21 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 30 Nov 2017 17:21:36 +0000 (12:21 -0500)
"ours" to avoid version bump


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