]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1272'
authorNick Mathewson <nickm@torproject.org>
Mon, 2 Sep 2019 18:13:32 +0000 (14:13 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 2 Sep 2019 18:13:32 +0000 (14:13 -0400)

Trivial merge