[tor-commits] [tor/master] Merge branch 'ticket32207'
nickm at torproject.org
nickm at torproject.org
Mon Dec 2 16:41:51 UTC 2019
commit f63cf2158b22b891a596a1274d1076faf3b69a27
Merge: 53bdd2117 af7416bfa
Author: Nick Mathewson <nickm at torproject.org>
Date: Mon Dec 2 11:41:40 2019 -0500
Merge branch 'ticket32207'
src/core/mainloop/mainloop_pubsub.h | 32 ++++++++
src/lib/pubsub/publish_subscribe.md | 144 ++++++++++++++++++++++++++++++++++++
src/mainpage.md | 1 +
3 files changed, 177 insertions(+)
diff --cc src/mainpage.md
index c5cb1af23,63a5b0a3f..3901e7955
--- a/src/mainpage.md
+++ b/src/mainpage.md
@@@ -41,8 -41,8 +41,9 @@@ Tor repository
@subpage time_periodic
- at subpage publish_subscribe
+ at subpage configuration
++ at subpage publish_subscribe
@page intro A high-level overview
More information about the tor-commits
mailing list