commit e7b146736f7014abb6dbce3e596ee5b94a1d5916 Merge: 2ef4bccb4 fcd26af7c Author: Nick Mathewson nickm@torproject.org Date: Tue Jun 26 09:21:59 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

changes/feature26372_029 | 4 ++++ configure.ac | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-)