]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2c9e0a2 483a59e)
Merge branch 'maint-0.3.1'
authorNick Mathewson <nickm@torproject.org>
Fri, 19 Jan 2018 15:18:35 +0000 (10:18 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 19 Jan 2018 15:18:35 +0000 (10:18 -0500)
"ours" merge to avoid the 0.3.1 version of the 24863 fix.


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