commit 37119ef9d87037d15122b59131e951d4c98e5089 Merge: 3015d3d7c c08102ea7 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Jun 26 09:21:59 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 changes/feature26372_029 | 4 ++++ configure.ac | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-)