]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1216' into maint-0.2.9
authorNick Mathewson <nickm@torproject.org>
Wed, 18 Sep 2019 01:26:17 +0000 (21:26 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 18 Sep 2019 01:26:17 +0000 (21:26 -0400)

Trivial merge