]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 03fc4cf 1a065ce)
Merge commit '1a065cea46a9c179d64d74d012f051135bc4725a' into maint-0.2.8
authorNick Mathewson <nickm@torproject.org>
Mon, 9 May 2016 18:58:38 +0000 (14:58 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 9 May 2016 18:58:38 +0000 (14:58 -0400)
This is an merge of maint-0.2.7 as an "ours" merge to avoid taking the
cherry-picked fix of 18490


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