commit e2ea9ad4db73e88cdece3b30aaf12aac5101ca7e Merge: 60a926f67 c362c6a85 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Jul 26 15:38:48 2017 -0400 Merge branch 'maint-0.2.7-redux' into release-0.2.7-redux .travis.yml | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ changes/bug22636 | 8 ++++++ 2 files changed, 96 insertions(+)