]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 00a4227 b39c50c)
Merge branch 'maint-0.3.0' into maint-0.3.1
authorNick Mathewson <nickm@torproject.org>
Fri, 19 Jan 2018 21:30:12 +0000 (16:30 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 19 Jan 2018 21:30:12 +0000 (16:30 -0500)
"ours" merge to avoid maint-0.3.0's version of 24895.


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