]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e7ade23 10baf2c)
Merge branch 'maint-0.2.8' into maint-0.2.9
authorNick Mathewson <nickm@torproject.org>
Wed, 7 Dec 2016 23:28:09 +0000 (18:28 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 7 Dec 2016 23:28:09 +0000 (18:28 -0500)
(ours merge, to avoid taking 20865 fix)


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