[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3

[nickm at torproject.org]

commit ad0bc6e54c906e3c9e44a25d7675954b88775535
Merge: 876b4b168 2dee38fba
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 5 08:36:13 2018 -0400

    Merge branch 'maint-0.3.3' into release-0.3.3

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