]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'dgoulet/ticket23310_032_02'
authorNick Mathewson <nickm@torproject.org>
Fri, 15 Sep 2017 13:01:22 +0000 (09:01 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 15 Sep 2017 13:01:22 +0000 (09:01 -0400)

Trivial merge