]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'ticket24963_042_02'
authorNick Mathewson <nickm@torproject.org>
Tue, 23 Jul 2019 18:03:30 +0000 (14:03 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 23 Jul 2019 18:03:30 +0000 (14:03 -0400)

Trivial merge