]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1033'
authorNick Mathewson <nickm@torproject.org>
Fri, 17 May 2019 12:18:20 +0000 (08:18 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 17 May 2019 12:18:20 +0000 (08:18 -0400)

Trivial merge