commit 00ee62b8a55a81518458f99f822c4147e121a4d3
Merge: 3c6f059 80a6c8c
Author: Nick Mathewson <ni...@torproject.org>
Date: Wed May 11 13:26:29 2016 -0400
Merge branch 'pubsub_squashed'
src/common/include.am | 2 +
src/common/pubsub.c | 129 +++++++++++++++++++++++++++++++++++
src/common/pubsub.h | 177 +++++++++++++++++++++++++++++++++++++++++++++++++
src/test/include.am | 1 +
src/test/test.c | 2 +
src/test/test_pubsub.c | 85 ++++++++++++++++++++++++
6 files changed, 396 insertions(+)
diff --cc src/common/include.am
index bae90ad,05342e9..f7c486d
--- a/src/common/include.am
+++ b/src/common/include.am
@@@ -67,8 -67,8 +67,9 @@@ 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 \
src/common/util_process.c \
src/common/sandbox.c \
@@@ -134,9 -133,9 +135,10 @@@ 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 \
src/common/torgzip.h \
src/common/torint.h \
src/common/torlog.h \
diff --cc src/test/test.c
index 3519dca,dcbaf5b..1595c8e
--- a/src/test/test.c
+++ b/src/test/test.c
@@@ -1231,8 -1231,8 +1232,9 @@@ struct testgroup_t testgroups[] =
{ "util/format/", util_format_tests },
{ "util/logging/", logging_tests },
{ "util/process/", util_process_tests },
+ { "util/pubsub/", pubsub_tests },
{ "util/thread/", thread_tests },
+ { "util/handle/", handle_tests },
{ "dns/", dns_tests },
END_OF_GROUPS
};
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
