commit b77bc9a1bb67c8229ada985619a088e5a78359fd Merge: 99513f7 c27ae62 Author: Nick Mathewson nickm@torproject.org Date: Fri Dec 23 11:04:18 2016 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

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