]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1076'
authorNick Mathewson <nickm@torproject.org>
Wed, 5 Jun 2019 19:35:43 +0000 (15:35 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 5 Jun 2019 19:35:43 +0000 (15:35 -0400)

Trivial merge