]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'teor/bug23760_nc'
authorNick Mathewson <nickm@torproject.org>
Tue, 21 Nov 2017 18:56:57 +0000 (13:56 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 21 Nov 2017 18:56:57 +0000 (13:56 -0500)

Trivial merge