commit 6de70d3f392774fd4ee358ffc193b4c68dde53c9 Merge: 7a32689 52cb1ed Author: Nick Mathewson nickm@torproject.org Date: Thu Dec 1 10:06:11 2016 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

changes/bug20235 | 4 ++++ configure.ac | 30 ++++++++++++++++++++++++++++-- 2 files changed, 32 insertions(+), 2 deletions(-)