]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/972'
authorNick Mathewson <nickm@torproject.org>
Mon, 29 Apr 2019 17:36:35 +0000 (13:36 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 29 Apr 2019 17:36:35 +0000 (13:36 -0400)

Trivial merge