Merge branch 'ftrapv_v3'

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

diff --cc .gitignore
Simple merge

diff --cc Makefile.am
index 13ba00d4b5d592af1cec94198df56507dfd7c73a,e9abfc6b999d88e19080f68f916ea200092a92e0..a8aa3af40d512a5defde373f55dac39335e9ace6
--- 1/Makefile.am
--- 2/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 configure.ac
Simple merge

diff --cc src/common/include.am
index f7c486d24af3f30e5b4fe238ff54b63659fb4189,33baa12005ab9e5c53fe660f4e8211df193234ff..6525e0b357577451af152718ae6f5df64d4efa87
--- 1/src/common/include.am
--- 2/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/ext/include.am
Simple merge

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

diff --cc src/test/include.am
index d1e1cbd7f66be70cfa07ef7c6dad82d0539a870a,d2909b2dcf6f6581983ac82816f43f7f200f38f1..db496aefd816d1c950914e484f9eefcd3168dd0a
--- 1/src/test/include.am
--- 2/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/common/libor-testing.a \
 +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) \
 +      @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 38ed57546f49c28577d4831d53c481f2a40a1015,b4ea82d3557e2f40695c915f9a2c52aeba6cf3ff..39e42a74a22a7c89d34f8163b07515a9013ff78c
--- 1/src/tools/include.am
--- 2/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@ \