[tor-commits] [tor/master] Merge branch 'tor-github/pr/859'

[asn@xxxxxxxxxxxxxx]

commit 00ca3d04cfa0625349a47d1a2f7c16ac66e7822d
Merge: 8991280f8 7b9732063
Author: George Kadianakis <desnacked@xxxxxxxxxx>
Date:   Wed Mar 27 14:30:53 2019 +0200

    Merge branch 'tor-github/pr/859'

 .gitignore                               |   4 +
 Makefile.am                              |   4 +
 changes/pubsub                           |   5 +
 doc/tor.1.txt                            |   2 +-
 scripts/maint/practracker/exceptions.txt |   3 +-
 src/app/main/main.c                      | 179 ++-------
 src/app/main/main.h                      |   3 -
 src/app/main/ntmain.c                    |   1 +
 src/app/main/shutdown.c                  | 192 ++++++++++
 src/app/main/shutdown.h                  |  18 +
 src/app/main/subsysmgr.c                 |  52 ++-
 src/app/main/subsysmgr.h                 |   5 +
 src/core/include.am                      |   4 +
 src/core/mainloop/mainloop_pubsub.c      | 170 +++++++++
 src/core/mainloop/mainloop_pubsub.h      |  24 ++
 src/include.am                           |   2 +
 src/lib/cc/compat_compiler.h             |  12 +
 src/lib/container/include.am             |   3 +
 src/lib/container/namemap.c              | 184 +++++++++
 src/lib/container/namemap.h              |  35 ++
 src/lib/container/namemap_st.h           |  34 ++
 src/lib/dispatch/.may_include            |  10 +
 src/lib/dispatch/dispatch.h              | 114 ++++++
 src/lib/dispatch/dispatch_cfg.c          | 141 +++++++
 src/lib/dispatch/dispatch_cfg.h          |  39 ++
 src/lib/dispatch/dispatch_cfg_st.h       |  25 ++
 src/lib/dispatch/dispatch_core.c         | 260 +++++++++++++
 src/lib/dispatch/dispatch_naming.c       |  63 ++++
 src/lib/dispatch/dispatch_naming.h       |  46 +++
 src/lib/dispatch/dispatch_new.c          | 174 +++++++++
 src/lib/dispatch/dispatch_st.h           | 108 ++++++
 src/lib/dispatch/include.am              |  25 ++
 src/lib/dispatch/msgtypes.h              |  80 ++++
 src/lib/log/log.c                        |   6 +-
 src/lib/log/log.h                        |  22 +-
 src/lib/pubsub/.may_include              |  10 +
 src/lib/pubsub/include.am                |  26 ++
 src/lib/pubsub/pub_binding_st.h          |  38 ++
 src/lib/pubsub/pubsub.h                  |  89 +++++
 src/lib/pubsub/pubsub_build.c            | 307 +++++++++++++++
 src/lib/pubsub/pubsub_build.h            |  92 +++++
 src/lib/pubsub/pubsub_builder_st.h       | 161 ++++++++
 src/lib/pubsub/pubsub_check.c            | 428 +++++++++++++++++++++
 src/lib/pubsub/pubsub_connect.h          |  54 +++
 src/lib/pubsub/pubsub_flags.h            |  32 ++
 src/lib/pubsub/pubsub_macros.h           | 373 +++++++++++++++++++
 src/lib/pubsub/pubsub_publish.c          |  72 ++++
 src/lib/pubsub/pubsub_publish.h          |  15 +
 src/lib/smartlist_core/smartlist_core.c  |  24 ++
 src/lib/smartlist_core/smartlist_core.h  |   1 +
 src/lib/subsys/subsys.h                  |   4 +-
 src/test/include.am                      |   4 +
 src/test/test.c                          |   4 +
 src/test/test.h                          |   4 +
 src/test/test_containers.c               |  61 +++
 src/test/test_dispatch.c                 | 249 +++++++++++++
 src/test/test_namemap.c                  | 174 +++++++++
 src/test/test_pubsub_build.c             | 621 +++++++++++++++++++++++++++++++
 src/test/test_pubsub_msg.c               | 305 +++++++++++++++
 59 files changed, 5035 insertions(+), 162 deletions(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits