]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'teor/bug19905'
authorNick Mathewson <nickm@torproject.org>
Wed, 31 Aug 2016 14:58:41 +0000 (10:58 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 31 Aug 2016 14:58:41 +0000 (10:58 -0400)

Trivial merge