]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'dgoulet/ticket23303_032_01'
authorNick Mathewson <nickm@torproject.org>
Thu, 21 Sep 2017 18:43:05 +0000 (14:43 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 21 Sep 2017 18:43:05 +0000 (14:43 -0400)

Trivial merge