commit 7a74d5a87ed04a15b6f19d73b145c9f58931e3f8 Merge: eab0d9242 be8e56c23 Author: Nick Mathewson nickm@torproject.org Date: Fri Aug 3 07:33:45 2018 -0400

Merge branch 'maint-0.3.4' into release-0.3.4

changes/bug20424_029_minimal | 4 ++++ configure.ac | 4 ++++ 2 files changed, 8 insertions(+)