]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'ticket24393_036_01_squashed'
authorNick Mathewson <nickm@torproject.org>
Wed, 31 Oct 2018 15:07:15 +0000 (11:07 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 31 Oct 2018 15:07:15 +0000 (11:07 -0400)

Trivial merge