]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 69c47ab ae0f858)
Merge remote-tracking branch 'andrea/bug18116'
authorNick Mathewson <nickm@torproject.org>
Wed, 10 Feb 2016 20:42:11 +0000 (15:42 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 10 Feb 2016 20:42:11 +0000 (15:42 -0500)

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