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

[nickm at torproject.org]

commit 607a9056d4d91762db0d5fc13250c6ed272f0e1b
Merge: 58e0e58 fb999ab
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 12 13:00:45 2016 -0400

    Merge branch 'ftrapv_v3'
    
    There were some conflicts here, and some breakage to fix concerning
    library link order in newer targets.

 .gitignore            |  3 ++
 Makefile.am           |  4 +--
 acinclude.m4          | 20 ++++++++---
 changes/bug17983      | 11 +++++++
 configure.ac          | 23 +++++++++++--
 src/common/di_ops.c   | 45 +++++++++++++++++++++++++
 src/common/di_ops.h   |  2 ++
 src/common/include.am | 35 +++++++++++++-------
 src/ext/include.am    |  9 +++--
 src/or/include.am     |  3 +-
 src/or/routerlist.c   | 91 ++++++++++++++++++++-------------------------------
 src/or/routerlist.h   | 13 ++------
 src/test/include.am   | 16 +++++++--
 src/test/test_dir.c   | 45 ++++++++++++-------------
 src/tools/include.am  | 11 +++++--
 15 files changed, 212 insertions(+), 119 deletions(-)

diff --cc Makefile.am
index 13ba00d,e9abfc6..a8aa3af
--- a/Makefile.am
+++ b/Makefile.am
@@@ -15,13 -15,13 +15,13 @@@ noinst_PROGRAMS
  DISTCLEANFILES=
  bin_SCRIPTS=
  AM_CPPFLAGS=
- AM_CFLAGS = @TOR_SYSTEMD_CFLAGS@
- SHELL = @SHELL@
+ AM_CFLAGS=@TOR_SYSTEMD_CFLAGS@ @CFLAGS_BUGTRAP@
+ SHELL=@SHELL@
  
  if COVERAGE_ENABLED
 -TESTING_TOR_BINARY="$(top_builddir)/src/or/tor-cov"
 +TESTING_TOR_BINARY=$(top_builddir)/src/or/tor-cov$(EXEEXT)
  else
 -TESTING_TOR_BINARY="$(top_builddir)/src/or/tor"
 +TESTING_TOR_BINARY=$(top_builddir)/src/or/tor$(EXEEXT)
  endif
  
  include src/include.am
diff --cc src/common/include.am
index f7c486d,33baa12..6525e0b
--- a/src/common/include.am
+++ b/src/common/include.am
@@@ -64,17 -77,14 +77,15 @@@ LIBOR_A_SRC = 
    src/common/compat.c					\
    src/common/compat_threads.c				\
    src/common/container.c				\
-   src/common/di_ops.c					\
    src/common/log.c					\
    src/common/memarea.c					\
 +  src/common/pubsub.c					\
    src/common/util.c					\
 +  src/common/util_bug.c					\
    src/common/util_format.c				\
    src/common/util_process.c				\
    src/common/sandbox.c					\
    src/common/workqueue.c				\
-   src/ext/csiphash.c					\
 -  src/ext/trunnel/trunnel.c				\
    $(libor_extra_source)					\
    $(threads_impl_source)				\
    $(readpassphrase_source)
@@@ -93,19 -103,18 +104,19 @@@ LIBOR_CRYPTO_A_SRC = 
    src/common/crypto_curve25519.c \
    src/common/crypto_ed25519.c
  
- LIBOR_EVENT_A_SOURCES = \
+ LIBOR_EVENT_A_SRC = \
  	src/common/compat_libevent.c \
 -	src/common/procmon.c
 +	src/common/procmon.c         \
 +	src/common/timers.c          \
 +	src/ext/timeouts/timeout.c
  
- src_common_libor_a_SOURCES = $(LIBOR_A_SOURCES)
- src_common_libor_crypto_a_SOURCES = $(LIBOR_CRYPTO_A_SOURCES)
- src_common_libor_event_a_SOURCES = $(LIBOR_EVENT_A_SOURCES)
+ src_common_libor_a_SOURCES = $(LIBOR_A_SRC)
+ src_common_libor_crypto_a_SOURCES = $(LIBOR_CRYPTO_A_SRC)
+ src_common_libor_event_a_SOURCES = $(LIBOR_EVENT_A_SRC)
  
- src_common_libor_testing_a_SOURCES = $(LIBOR_A_SOURCES)
- src_common_libor_crypto_testing_a_SOURCES = $(LIBOR_CRYPTO_A_SOURCES)
- src_common_libor_event_testing_a_SOURCES = $(LIBOR_EVENT_A_SOURCES)
+ src_common_libor_testing_a_SOURCES = $(LIBOR_A_SRC)
+ src_common_libor_crypto_testing_a_SOURCES = $(LIBOR_CRYPTO_A_SRC)
+ src_common_libor_event_testing_a_SOURCES = $(LIBOR_EVENT_A_SRC)
  
  src_common_libor_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS)
  src_common_libor_crypto_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS)
diff --cc src/test/include.am
index d1e1cbd,d2909b2..db496ae
--- a/src/test/include.am
+++ b/src/test/include.am
@@@ -196,16 -197,6 +203,17 @@@ src_test_test_workqueue_LDADD = src/or/
  	@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
  	@TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
  
 +src_test_test_timers_CPPFLAGS = $(src_test_test_CPPFLAGS)
 +src_test_test_timers_CFLAGS = $(src_test_test_CFLAGS)
 +src_test_test_timers_LDADD = \
++	src/common/libor-testing.a \
++	src/common/libor-ctime-testing.a \
 +	src/common/libor-event-testing.a \
 +	src/common/libor-crypto-testing.a $(LIBKECCAK_TINY) $(LIBDONNA) \
- 	src/common/libor-testing.a \
 +	@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
 +	@TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
 +src_test_test_timers_LDFLAGS = $(src_test_test_LDFLAGS)
 +
  noinst_HEADERS+= \
  	src/test/fakechans.h \
  	src/test/log_test_helpers.h \
diff --cc src/tools/include.am
index 38ed575,b4ea82d..39e42a7
--- a/src/tools/include.am
+++ b/src/tools/include.am
@@@ -31,7 -35,8 +35,8 @@@ src_tools_tor_cov_gencert_CPPFLAGS = $(
  src_tools_tor_cov_gencert_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
  src_tools_tor_cov_gencert_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@
  src_tools_tor_cov_gencert_LDADD = src/common/libor-testing.a \
 -    src/common/libor-ctime-testing.a \
      src/common/libor-crypto-testing.a \
++    src/common/libor-ctime-testing.a \
      $(LIBKECCAK_TINY) \
      $(LIBDONNA) \
          @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \