commit c27ae62adefb9fcdf468eef43e8a33ae3657a6bf Merge: aaeb50b 2f589e1 Author: Nick Mathewson nickm@torproject.org Date: Fri Dec 23 11:01:54 2016 -0500

Merge branch 'bug21051_v2' into maint-0.2.9

changes/bug21051 | 3 +++ configure.ac | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-)