Merge remote-tracking branch 'tor-github/pr/1689'
commit27099ffe6a6db70f08bd1d06b602d7313053c399
authorNick Mathewson <nickm@torproject.org>
Tue, 28 Jan 2020 12:55:34 +0000 (28 07:55 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 28 Jan 2020 12:55:34 +0000 (28 07:55 -0500)
treea8a0d9ff02009efbda6767cf1e3c809749c52dc6
parentaba31e2187808257b250bf469895330f273d7746
parent9d771ccc86a7b8f04a40d619b78f7d99f67c176f
Merge remote-tracking branch 'tor-github/pr/1689'
.travis.yml