]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'dgoulet/ticket27040_035_01'
authorNick Mathewson <nickm@torproject.org>
Fri, 14 Sep 2018 16:54:13 +0000 (12:54 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 14 Sep 2018 16:54:13 +0000 (12:54 -0400)

Trivial merge