]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/539'
authorNick Mathewson <nickm@torproject.org>
Mon, 26 Nov 2018 22:22:37 +0000 (17:22 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 26 Nov 2018 22:22:37 +0000 (17:22 -0500)

Trivial merge