commit 84a9ff0feb4b5ae3338bea2b0a437d812f4a357a Merge: 808e52d 7675166 Author: Nick Mathewson nickm@torproject.org Date: Mon Jan 23 08:55:34 2017 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

changes/trove-2017-001 | 8 ++++++++ configure.ac | 15 ++++++++++----- 2 files changed, 18 insertions(+), 5 deletions(-)