]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'bug23909'
authorNick Mathewson <nickm@torproject.org>
Fri, 16 Feb 2018 01:56:23 +0000 (20:56 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 16 Feb 2018 01:56:23 +0000 (20:56 -0500)

Trivial merge