commit 63cddead384d067604f44091e2a8a3f776ccd2bf Merge: 6c38795b7 f8dad5a07 Author: Nick Mathewson nickm@torproject.org Date: Tue Jun 26 09:21:59 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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