commit 1c85b609d5e3c85c424800da508e80769474cb57 Merge: 56fd0249f bcce3e7e0 Author: Nick Mathewson nickm@torproject.org Date: Tue Jul 31 08:30:01 2018 -0400

Merge branch 'maint-0.3.4' into release-0.3.4

changes/bug26876 | 4 ++++ configure.ac | 32 +++++++++++++++++++++++++++++--- 2 files changed, 33 insertions(+), 3 deletions(-)