commit 676a28599dcc3854a98c684808055db76dcd265b Merge: e9dbd6dd8 094294dbb Author: Nick Mathewson <nickm@torproject.org> Date: Tue Mar 13 13:41:24 2018 +0100 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug25474 | 5 +++++ configure.ac | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-)