]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1185'
authorNick Mathewson <nickm@torproject.org>
Tue, 23 Jul 2019 16:32:14 +0000 (12:32 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 23 Jul 2019 16:32:14 +0000 (12:32 -0400)

Trivial merge