[tor-commits] [tor/master] Merge branch 'nss-travis' into maint-0.3.5

[nickm at torproject.org]

commit 98e28efa8c2558e408313254c161a3ff9b371f27
Merge: 131ab9d52 fcbbcf92c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 24 08:57:22 2018 -0400

    Merge branch 'nss-travis' into maint-0.3.5

 .travis.yml         | 5 ++++-
 changes/ticket27751 | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)