commit add0306cab6d16225eb1ae195064994cd3d1d481 Merge: 7d509bc17 5227754b2 Author: Nick Mathewson <nickm@torproject.org> Date: Thu May 3 13:38:54 2018 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 .travis.yml | 4 +++- Makefile.am | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-)