[tor-commits] [tor/maint-0.2.8] Merge branch 'maint-0.2.7' into maint-0.2.8

[nickm at torproject.org]

commit 50249c7cd97c982fe829a9e7a22e660658b4e217
Merge: 5cd5979 039fc84
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 11 12:23:20 2016 -0400

    Merge branch 'maint-0.2.7' into maint-0.2.8

 changes/bug18841.1 | 7 +++++++
 configure.ac       | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --cc configure.ac
index e4816fd,8107c90..a487948
--- a/configure.ac
+++ b/configure.ac
@@@ -760,9 -717,9 +760,9 @@@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], 
  #error
  #endif])], have_clang=yes, have_clang=no)
  
 -if test x$enable_gcc_hardening != xno; then
 +if test "x$enable_gcc_hardening" != "xno"; then
-     CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"
+     CFLAGS="$CFLAGS -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2"
 -    if test x$have_clang = xyes; then
 +    if test "x$have_clang" = "xyes"; then
          TOR_CHECK_CFLAGS(-Qunused-arguments)
      fi
      TOR_CHECK_CFLAGS(-fstack-protector-all, also_link)