]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'dgoulet/ticket23305_032_01'
authorNick Mathewson <nickm@torproject.org>
Wed, 20 Sep 2017 12:36:11 +0000 (08:36 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 20 Sep 2017 12:36:11 +0000 (08:36 -0400)

Trivial merge