commit 617b9205515a8ee5f9ddf4fac14eff5178111641 Merge: c404905 d9080f5 Author: Nick Mathewson <nickm@torproject.org> Date: Fri May 27 12:52:39 2016 -0400 Merge remote-tracking branch 'public/hardening_flags_must_link' changes/bug18895 | 6 ++++++ configure.ac | 25 ++++++++++++++++++++----- 2 files changed, 26 insertions(+), 5 deletions(-)