From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 11 May 2016 17:26:29 +0000 (-0400)
Subject: Merge branch 'pubsub_squashed'
X-Git-Tag: tor-0.2.9.1-alpha~256
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=00ee62b8a55a81518458f99f822c4147e121a4d3;p=thirdparty%2Ftor.git

Merge branch 'pubsub_squashed'
---

00ee62b8a55a81518458f99f822c4147e121a4d3
diff --cc src/common/include.am
index bae90ad977,05342e9e1c..f7c486d24a
--- 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 3519dcadb0,dcbaf5bbca..1595c8ee4f
--- 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
  };