commit 0456ec21530f3364c0f41f1492e428ff330f24b0 Merge: ed73b086b 676a28599 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Mar 13 13:44:09 2018 +0100 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug25474 | 5 +++++ configure.ac | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-)