commit 4671b05736c1c09d6d6f126f47875d18f5a06156 Merge: ac46e04fe d6d3f8486 Author: Nick Mathewson nickm@torproject.org Date: Tue Jun 26 09:21:59 2018 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

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