Merge branch 'pubsub_squashed'

diff --cc src/common/include.am
index bae90ad9773bfd79efc1713ec7d6b4d323a9bc96,05342e9e1ca47403367b58d609a80dd1438c0903..f7c486d24af3f30e5b4fe238ff54b63659fb4189
--- 1/src/common/include.am
--- 2/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/include.am
Simple merge

diff --cc src/test/test.c
index 3519dcadb0e37d6eec622d874f3c6242110e436e,dcbaf5bbca3ea24beaa0eba1c630cbad68a0f330..1595c8ee4f4f47bc3ea415ea9525877b1b02de9b
--- 1/src/test/test.c
--- 2/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
  };