]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 50249c7 92d7ee0)
Merge remote-tracking branch 'teor/bug18816-squashed' into maint-0.2.8
authorNick Mathewson <nickm@torproject.org>
Wed, 11 May 2016 16:28:37 +0000 (12:28 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 11 May 2016 16:28:37 +0000 (12:28 -0400)

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