commit 2cc900e74acd59ac5250b0b58f3b3f6a06665e2e Merge: 91f06ba 16fcbd2 Author: Nick Mathewson nickm@torproject.org Date: Thu Dec 1 10:05:38 2016 -0500

Merge branch 'maint-0.2.8' into release-0.2.8

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