]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/206'
authorNick Mathewson <nickm@torproject.org>
Sat, 11 Aug 2018 14:14:29 +0000 (10:14 -0400)
committerNick Mathewson <nickm@torproject.org>
Sat, 11 Aug 2018 14:14:29 +0000 (10:14 -0400)

Trivial merge