]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9f1899f bd71e0a)
Merge branch 'maint-0.3.2' into maint-0.3.3
authorNick Mathewson <nickm@torproject.org>
Fri, 16 Feb 2018 14:55:41 +0000 (09:55 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 16 Feb 2018 14:55:41 +0000 (09:55 -0500)
"ours" merge to avoid taking 24902 a second time and having to reconcile
all the merge conflicts.


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