]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1349'
authorNick Mathewson <nickm@torproject.org>
Wed, 25 Sep 2019 17:07:19 +0000 (13:07 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 25 Sep 2019 17:07:19 +0000 (13:07 -0400)

Trivial merge