[tor-commits] [tor/maint-0.2.9] Merge remote-tracking branch 'catalyst-github/bug25388-025' into maint-0.2.5

commit 0eb2cdf99de77556fce549ba856887d5852a034b Merge: 3418a3a7f 09484b944 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Mar 19 05:42:38 2018 -0400 Merge remote-tracking branch 'catalyst-github/bug25388-025' into maint-0.2.5 .travis.yml | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-)