]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 444e9b3 389bae0)
Merge branch 'maint-0.3.5'
authorNick Mathewson <nickm@torproject.org>
Wed, 17 Oct 2018 18:46:10 +0000 (14:46 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 17 Oct 2018 18:46:10 +0000 (14:46 -0400)
"ours" to avoid version bump.


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