]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'bug22109'
authorNick Mathewson <nickm@torproject.org>
Mon, 25 Sep 2017 18:32:04 +0000 (14:32 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 25 Sep 2017 18:32:04 +0000 (14:32 -0400)

Trivial merge