]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e468498 0ec72b0)
Merge branch 'maint-0.2.8' into maint-0.3.0
authorNick Mathewson <nickm@torproject.org>
Mon, 18 Sep 2017 13:40:09 +0000 (09:40 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 18 Sep 2017 13:40:09 +0000 (09:40 -0400)
This is an "ours" merge to avoid the conflict from the 0.2.8 version
of the fix for TROVE-2017-008.


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