commit c08102ea777ddaaa8404021a1c8b84082f5eff8b Merge: cf0597c3b f8dad5a07 Author: Nick Mathewson nickm@torproject.org Date: Tue Jun 26 09:21:59 2018 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

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