commit 25226fb260a6b5f93187b707ec35f06637fbe710 Merge: 6107a2127 d6d3f8486 Author: Nick Mathewson nickm@torproject.org Date: Tue Jun 26 09:21:59 2018 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

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