]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'nickm/ticket29530_040' into maint-0.4.0
authorRoger Dingledine <arma@torproject.org>
Wed, 20 Feb 2019 15:39:28 +0000 (10:39 -0500)
committerRoger Dingledine <arma@torproject.org>
Wed, 20 Feb 2019 15:39:28 +0000 (10:39 -0500)

Trivial merge