[tor-commits] [tor/release-0.2.9] Merge remote-tracking branch 'catalyst-github/bug25936-029' into maint-0.2.9

[nickm at torproject.org]

commit 5227754b2f441c93da6436697a19841e9e71246f
Merge: d465bd27e 31865b502
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 3 13:38:37 2018 -0400

    Merge remote-tracking branch 'catalyst-github/bug25936-029' into maint-0.2.9

 .travis.yml | 4 +++-
 Makefile.am | 9 +++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)