]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'asn-github/bug27764'
authorNick Mathewson <nickm@torproject.org>
Tue, 18 Sep 2018 12:10:25 +0000 (08:10 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 18 Sep 2018 12:10:25 +0000 (08:10 -0400)

Trivial merge