]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'dgoulet/ticket27410_035_01'
authorNick Mathewson <nickm@torproject.org>
Thu, 20 Sep 2018 20:22:16 +0000 (16:22 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 20 Sep 2018 20:22:16 +0000 (16:22 -0400)

Trivial merge