commit 27099ffe6a6db70f08bd1d06b602d7313053c399 Merge: aba31e218 9d771ccc8 Author: Nick Mathewson nickm@torproject.org Date: Tue Jan 28 07:55:34 2020 -0500

Merge remote-tracking branch 'tor-github/pr/1689'

.travis.yml | 2 -- changes/ticket33075 | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-)