]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'catalyst-oniongit/bug23755'
authorNick Mathewson <nickm@torproject.org>
Tue, 10 Oct 2017 18:07:34 +0000 (14:07 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 10 Oct 2017 18:07:34 +0000 (14:07 -0400)

Trivial merge