diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-05-09 14:06:10 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-05-09 14:06:10 -0400 |
| commit | 69380033d644d39a7369e0cd2b2cb7fd5cd7c695 (patch) | |
| tree | 4c06dd268817276028ece95eeb6d1db91a7cb9a6 /src/common/include.am | |
| parent | 641cdc345c7a0e8123cee9a7b3864b63ba389afa (diff) | |
| parent | af132fc299f837f8749278099e6257cea3795e8e (diff) | |
| download | tor-69380033d644d39a7369e0cd2b2cb7fd5cd7c695.tar.gz tor-69380033d644d39a7369e0cd2b2cb7fd5cd7c695.zip | |
Merge branch 'timeouts_v2_squashed'
Diffstat (limited to 'src/common/include.am')
| -rw-r--r-- | src/common/include.am | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/common/include.am b/src/common/include.am index f2e89a7b49..bae90ad977 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -94,7 +94,9 @@ LIBOR_CRYPTO_A_SOURCES = \ LIBOR_EVENT_A_SOURCES = \ 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) @@ -134,6 +136,7 @@ COMMONHEADERS = \ src/common/procmon.h \ src/common/sandbox.h \ src/common/testsupport.h \ + src/common/timers.h \ src/common/torgzip.h \ src/common/torint.h \ src/common/torlog.h \ |