]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'bug23080'
authorNick Mathewson <nickm@torproject.org>
Wed, 20 Sep 2017 16:12:02 +0000 (12:12 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 20 Sep 2017 16:12:02 +0000 (12:12 -0400)

Trivial merge