]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'dgoulet/ticket23427_032_01'
authorNick Mathewson <nickm@torproject.org>
Thu, 7 Sep 2017 19:20:01 +0000 (15:20 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 7 Sep 2017 19:20:01 +0000 (15:20 -0400)

Trivial merge