]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0a43134 5446cb8)
Merge branch 'maint-0.2.6' into maint-0.2.7
authorNick Mathewson <nickm@torproject.org>
Tue, 7 Feb 2017 14:29:27 +0000 (09:29 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 7 Feb 2017 14:29:27 +0000 (09:29 -0500)
"ours" merge to avoid reverting 17354, which was already fixed in
0.2.7.4-rc.


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