]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1278'
authorNick Mathewson <nickm@torproject.org>
Thu, 5 Sep 2019 11:41:58 +0000 (07:41 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 5 Sep 2019 11:41:58 +0000 (07:41 -0400)

Trivial merge