[tor-commits] [tor/master] Merge branch 'bug19180_easy_squashed'

nickm at torproject.org nickm at torproject.org
Sat Jun 11 14:16:58 UTC 2016


commit d6b2af7a3aba24cf3d77587c41028aad70d59605
Merge: c274f82 e80a032
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Jun 11 10:15:40 2016 -0400

    Merge branch 'bug19180_easy_squashed'

 acinclude.m4                                      |   2 +-
 changes/bug19203                                  |   4 +
 changes/bug19216                                  |   4 +
 configure.ac                                      | 305 +++++++++++++++++-----
 src/common/address.c                              |   3 +-
 src/common/address.h                              |  16 +-
 src/common/compat.h                               |  38 +++
 src/common/compat_libevent.c                      |   2 +-
 src/common/crypto.h                               |   5 +
 src/common/log.c                                  |   2 +-
 src/common/sandbox.c                              |   2 +-
 src/common/torlog.h                               |   2 +-
 src/common/tortls.c                               |  21 +-
 src/common/tortls.h                               |  10 +
 src/common/util.c                                 |   4 +-
 src/common/util_process.c                         |   4 +-
 src/ext/ed25519/donna/curve25519-donna-64bit.h    |   4 +-
 src/ext/ed25519/donna/ed25519-donna-64bit-x86.h   |   9 +
 src/ext/ed25519/donna/ed25519-donna-batchverify.h |   2 +-
 src/ext/ht.h                                      |   2 +
 src/ext/tinytest.c                                |   9 +-
 src/or/channel.c                                  |  10 +-
 src/or/channel.h                                  |   4 +
 src/or/channeltls.c                               |   9 +-
 src/or/channeltls.h                               |   8 +
 src/or/circuitlist.c                              |   2 +-
 src/or/circuitmux.c                               |   2 +-
 src/or/circuitmux_ewma.h                          |   5 -
 src/or/config.c                                   |   9 +-
 src/or/confparse.c                                |   4 +-
 src/or/connection.c                               |   4 +-
 src/or/dircollate.c                               |   4 +-
 src/or/dirserv.c                                  |   5 +-
 src/or/geoip.c                                    |  12 +-
 src/or/hibernate.c                                |   2 -
 src/or/keypin.c                                   |   8 +-
 src/or/main.c                                     |   3 -
 src/or/main.h                                     |   8 +
 src/or/microdesc.c                                |   2 +-
 src/or/nodelist.c                                 |   6 +-
 src/or/onion.c                                    |   2 +-
 src/or/onion_ntor.c                               |   2 +-
 src/or/rendcache.h                                |   7 +
 src/or/rephist.c                                  |   2 +-
 src/or/rephist.h                                  |   7 +
 src/or/router.c                                   |   2 -
 src/or/routerlist.c                               |   2 +-
 src/or/scheduler.h                                |   7 +
 src/or/tor_main.c                                 |   2 +
 src/test/bench.c                                  |   1 +
 src/test/example_extrainfo.inc                    |  34 ++-
 src/test/test-memwipe.c                           |   1 +
 src/test/test.c                                   |  56 ----
 src/test/test.h                                   |  75 ++++++
 src/test/test_bt_cl.c                             |   6 +
 src/test/test_buffers.c                           |   6 +-
 src/test/test_channel.c                           |  21 +-
 src/test/test_channeltls.c                        |  16 +-
 src/test/test_crypto.c                            |   7 -
 src/test/test_data.c                              |   2 +
 src/test/test_dir_common.c                        |   7 -
 src/test/test_dir_handle_get.c                    |  10 +-
 src/test/test_handles.c                           |   4 +-
 src/test/test_helpers.c                           |   8 +
 src/test/test_introduce.c                         |   2 -
 src/test/test_link_handshake.c                    |   2 +-
 src/test/test_microdesc.c                         |   8 +
 src/test/test_options.c                           |   4 +-
 src/test/test_policy.c                            |   4 +-
 src/test/test_relaycell.c                         |   2 +-
 src/test/test_rendcache.c                         |   5 -
 src/test/test_routerlist.c                        |   9 +-
 src/test/test_routerset.c                         |  26 +-
 src/test/test_scheduler.c                         |   6 -
 src/test/test_slow.c                              |   3 -
 src/test/test_socks.c                             |   2 +-
 src/test/test_status.c                            |   2 -
 src/test/test_tortls.c                            |  17 +-
 src/test/test_util.c                              |  23 +-
 src/test/testing_common.c                         |   4 +-
 src/test/vote_descriptors.inc                     |   2 +-
 src/tools/tor-gencert.c                           |  30 +--
 82 files changed, 643 insertions(+), 352 deletions(-)

diff --cc configure.ac
index 7259bf7,7945737..a5546bc
--- a/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





More information about the tor-commits mailing list