]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/699'
authorNick Mathewson <nickm@torproject.org>
Wed, 13 Feb 2019 20:19:59 +0000 (15:19 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 13 Feb 2019 20:19:59 +0000 (15:19 -0500)

Trivial merge