[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1680'

[nickm at torproject.org]

commit 99671c0dae42b3b7ffbccada518d241641773bb2
Merge: 27099ffe6 a207fd722
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jan 28 08:15:21 2020 -0500

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

 .travis.yml         | 4 ++++
 changes/ticket32455 | 2 ++
 2 files changed, 6 insertions(+)