]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1235'
authorNick Mathewson <nickm@torproject.org>
Mon, 19 Aug 2019 15:10:21 +0000 (11:10 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 19 Aug 2019 15:10:21 +0000 (11:10 -0400)

Trivial merge