]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7a78282 b76b9d7)
Merge remote-tracking branch 'teor/bug18384'
authorNick Mathewson <nickm@torproject.org>
Thu, 25 Feb 2016 18:46:34 +0000 (13:46 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 25 Feb 2016 18:46:34 +0000 (13:46 -0500)

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