]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0e5cf4a 66c85cd)
Merge branch 'maint-0.3.0' into maint-0.3.1
authorNick Mathewson <nickm@torproject.org>
Fri, 7 Jul 2017 14:57:05 +0000 (10:57 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 7 Jul 2017 14:57:05 +0000 (10:57 -0400)
This is an "ours" commit to avoid taking the fix for 22838,
which we already have here.


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