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

[nickm at torproject.org]

commit 97b5ff2b1d6ec59aea66cc262cf2545c98eefc5b
Merge: 7aaa4ae30 8746fedce
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Nov 15 09:10:11 2019 -0500

    Merge branch 'ticket32211'

 Doxyfile.in                       |  2 +
 src/lib/subsys/initialization.dox | 77 +++++++++++++++++++++++++++++++++++++++
 src/lib/subsys/subsys.h           | 63 ++++++++++++++++++++++++++++++--
 src/mainpage.dox                  |  2 +
 4 files changed, 140 insertions(+), 4 deletions(-)

diff --cc src/mainpage.dox
index 1da074951,575d8b7f4..e3b17cf16
--- a/src/mainpage.dox
+++ b/src/mainpage.dox
@@@ -30,16 -30,10 +30,18 @@@ Tor repository
  
  @subpage intro
  
+ @subpage initialization
+ 
  @subpage dataflow
  
 + at subpage certificates
 +
 + at subpage threading
 +
 + at subpage strings
 +
 + at subpage time_periodic
 +
  **/
  
  /**