]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1544'
authorNick Mathewson <nickm@torproject.org>
Sat, 16 Nov 2019 20:29:14 +0000 (15:29 -0500)
committerNick Mathewson <nickm@torproject.org>
Sat, 16 Nov 2019 20:29:14 +0000 (15:29 -0500)

Trivial merge