]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'ahf/bugs/21757'
authorNick Mathewson <nickm@torproject.org>
Mon, 27 Mar 2017 13:02:48 +0000 (15:02 +0200)
committerNick Mathewson <nickm@torproject.org>
Mon, 27 Mar 2017 13:02:48 +0000 (15:02 +0200)

Trivial merge