]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9b18b21 b2f82d4)
Merge remote-tracking branch 'arma/bug19969_028_squashed' into maint-0.2.8
authorNick Mathewson <nickm@torproject.org>
Thu, 3 Nov 2016 19:44:30 +0000 (15:44 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 3 Nov 2016 19:44:30 +0000 (15:44 -0400)

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