]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'dgoulet/ticket28619_033_01' into maint-0.3.3
authorNick Mathewson <nickm@torproject.org>
Fri, 4 Jan 2019 19:49:16 +0000 (14:49 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 4 Jan 2019 19:49:16 +0000 (14:49 -0500)

Trivial merge