]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'rl1987/bug24891'
authorNick Mathewson <nickm@torproject.org>
Wed, 13 Jun 2018 13:46:50 +0000 (09:46 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 13 Jun 2018 13:46:50 +0000 (09:46 -0400)

Trivial merge