commit 4a93ed1ede4c725cc4212d2f2d6df460df1c9610 Merge: beaeee2 7675166 Author: Nick Mathewson nickm@torproject.org Date: Mon Jan 23 08:55:40 2017 -0500

Merge branch 'maint-0.2.9'

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