]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1659'
authorNick Mathewson <nickm@torproject.org>
Tue, 14 Jan 2020 17:40:07 +0000 (12:40 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 14 Jan 2020 17:40:07 +0000 (12:40 -0500)

Trivial merge