]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1270'
authorNick Mathewson <nickm@torproject.org>
Wed, 4 Sep 2019 13:52:35 +0000 (09:52 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 4 Sep 2019 13:52:35 +0000 (09:52 -0400)

Trivial merge