]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 115cefd c6f2ae5)
Merge branch 'maint-0.2.6' into maint-0.2.7
authorNick Mathewson <nickm@torproject.org>
Tue, 7 Feb 2017 14:20:13 +0000 (09:20 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 7 Feb 2017 14:20:13 +0000 (09:20 -0500)
This is an "ours" merge to avoid conflicts on the authority list:
the 0.2.7 branch already has the tonga->bifroest merge.


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