[tor-commits] [tor/master] Merge branch 'ticket32207'

[nickm@xxxxxxxxxxxxxx]

commit f63cf2158b22b891a596a1274d1076faf3b69a27
Merge: 53bdd2117 af7416bfa
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
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
  
 -@subpage publish_subscribe
 +@subpage configuration
  
++@subpage publish_subscribe
  
  @page intro A high-level overview
  

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