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