diff options
author | Nick Mathewson <nickm@torproject.org> | 2016-05-11 13:26:29 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2016-05-11 13:26:29 -0400 |
commit | 00ee62b8a55a81518458f99f822c4147e121a4d3 (patch) | |
tree | fa58104f8140de6c1ff77b48aa19ffcba9fc1388 /src/common/include.am | |
parent | 3c6f059e6aa5e4b7937f364cc0101229b6386818 (diff) | |
parent | 80a6c8caa3910b18ce50ef870ef0af546c64faa2 (diff) | |
download | tor-00ee62b8a55a81518458f99f822c4147e121a4d3.tar.gz tor-00ee62b8a55a81518458f99f822c4147e121a4d3.zip |
Merge branch 'pubsub_squashed'
Diffstat (limited to 'src/common/include.am')
-rw-r--r-- | src/common/include.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/common/include.am b/src/common/include.am index bae90ad977..f7c486d24a 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -67,6 +67,7 @@ LIBOR_A_SOURCES = \ 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 \ @@ -134,6 +135,7 @@ COMMONHEADERS = \ src/common/memarea.h \ src/common/linux_syscalls.inc \ src/common/procmon.h \ + src/common/pubsub.h \ src/common/sandbox.h \ src/common/testsupport.h \ src/common/timers.h \ |