Merge branch 'bug19180_easy_squashed'

diff --cc configure.ac
index 7259bf75ecad23757e449b769b8af94636544cc6,79457372f7194c39380c87d604ef2af422600fb6..a5546bc5a9aeaed1f2b56c8abaa5d23c1f4858a0
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -1697,42 -1904,20 +1905,17 @@@ if test "x$enable_gcc_warnings_advisory
    CFLAGS="$CFLAGS -W -Wfloat-equal -Wundef -Wpointer-arith"
    CFLAGS="$CFLAGS -Wstrict-prototypes -Wmissing-prototypes -Wwrite-strings"
    CFLAGS="$CFLAGS -Wredundant-decls -Wchar-subscripts -Wcomment -Wformat=2"
-   CFLAGS="$CFLAGS -Wwrite-strings -Wmissing-declarations -Wredundant-decls"
+   CFLAGS="$CFLAGS -Wwrite-strings"
    CFLAGS="$CFLAGS -Wnested-externs -Wbad-function-cast -Wswitch-enum"
- 
-   # Disabled, so we can use mallinfo(): -Waggregate-return
- 
-   if test "x$have_gcc4" = "xyes"; then
-     # These warnings break gcc 3.3.5 and work on gcc 4.0.2
-     CFLAGS="$CFLAGS -Winit-self -Wmissing-field-initializers -Wold-style-definition"
-   fi
- 
-   if test "x$have_gcc42" = "xyes"; then
-     # These warnings break gcc 4.0.2 and work on gcc 4.2
-     CFLAGS="$CFLAGS -Waddress -Wmissing-noreturn -Wstrict-overflow=1"
- 
-     # We used to use -Wstrict-overflow=5, but that breaks us heavily under 4.3.
-   fi
- 
-   if test "x$have_gcc42" = "xyes" && test "x$have_clang" = "xno"; then
-     # These warnings break gcc 4.0.2 and clang, but work on gcc 4.2
-     CFLAGS="$CFLAGS -Wnormalized=id -Woverride-init"
-   fi
- 
-   if test "x$have_gcc43" = "xyes"; then
-     # These warnings break gcc 4.2 and work on gcc 4.3
-     CFLAGS="$CFLAGS -Wextra -Warray-bounds"
-   fi
- 
-   if test "x$have_gcc46" = "xyes"; then
-     # This warning was added in gcc 4.3, but it appears to generate
-     # spurious warnings in gcc 4.4.  I don't know if it works in 4.5.
-     CFLAGS="$CFLAGS -Wlogical-op"
-   fi
- 
-   if test "x$have_shorten64_flag" = "xyes"; then
-     CFLAGS="$CFLAGS -Wshorten-64-to-32"
+   CFLAGS="$CFLAGS -Waggregate-return -Wpacked -Wunused"
+   CFLAGS="$CFLAGS -Wunused-parameter "
+   # These interfere with building main() { return 0; }, which autoconf
+   # likes to use as its default program.
+   CFLAGS="$CFLAGS -Wold-style-definition -Wmissing-declarations"
+ 
+   if test "$tor_cv_cflags__Wnull_dereference" = "yes"; then
+     AC_DEFINE([HAVE_CFLAG_WNULL_DEREFERENCE], 1, [True if we have -Wnull-dereference])
    fi
 -  if test "$tor_cv_cflags__Woverlength_strings" = "yes"; then
 -    AC_DEFINE([HAVE_CFLAG_WOVERLENGTH_STRINGS], 1, [True if we have -Woverlength-strings])
 -  fi
  
    if test "x$enable_fatal_warnings" = "xyes"; then
      # I'd like to use TOR_CHECK_CFLAGS here, but I can't, since the

diff --cc src/common/address.c
Simple merge

diff --cc src/or/config.c
Simple merge

diff --cc src/or/connection.c
Simple merge

diff --cc src/or/dirserv.c
Simple merge

diff --cc src/or/main.c
Simple merge

diff --cc src/or/microdesc.c
Simple merge

diff --cc src/or/onion.c
Simple merge

diff --cc src/or/rephist.c
Simple merge

diff --cc src/or/router.c
Simple merge

diff --cc src/or/routerlist.c
Simple merge

diff --cc src/test/test_crypto.c
Simple merge

diff --cc src/test/test_dir_handle_get.c
Simple merge

diff --cc src/test/test_util.c
Simple merge