commit c80b7186bcd0b7759c8660c42b05556b45e67711 Merge: 863538a ef53526 Author: Nick Mathewson nickm@torproject.org Date: Sun Dec 11 22:22:35 2016 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

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