]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6851a08 b063ca0)
Merge branch 'maint-0.3.4' into maint-0.3.5
authorNick Mathewson <nickm@torproject.org>
Wed, 24 Oct 2018 16:57:14 +0000 (12:57 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 24 Oct 2018 16:57:14 +0000 (12:57 -0400)
"ours" to avoid taking a second instance of 27797.


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