Sfoglia il codice sorgente

Merge remote-tracking branch 'dgoulet/bug15254_027_01'

Nick Mathewson 10 anni fa
parent
commit
f273295cad
3 ha cambiato i file con 6 aggiunte e 2 eliminazioni
  1. 4 0
      changes/ticket15254-hs-stats-default
  2. 1 1
      doc/tor.1.txt
  3. 1 1
      src/or/config.c

+ 4 - 0
changes/ticket15254-hs-stats-default

@@ -0,0 +1,4 @@
+  o Hidden Service Statistics
+    - Turn on hidden service statistics collection by setting the torrc
+      option HiddenServiceStatistics to "1" by default. Closes ticket
+      #15254.

+ 1 - 1
doc/tor.1.txt

@@ -1848,7 +1848,7 @@ is non-zero):
     statistics on its role as hidden-service directory, introduction
     statistics on its role as hidden-service directory, introduction
     point, or rendezvous point to disk every 24 hours. If
     point, or rendezvous point to disk every 24 hours. If
     ExtraInfoStatistics is also enabled, these statistics are further
     ExtraInfoStatistics is also enabled, these statistics are further
-    published to the directory authorities. (Default: 0)
+    published to the directory authorities. (Default: 1)
 
 
 [[ExtraInfoStatistics]] **ExtraInfoStatistics** **0**|**1**::
 [[ExtraInfoStatistics]] **ExtraInfoStatistics** **0**|**1**::
     When this option is enabled, Tor includes previously gathered statistics in
     When this option is enabled, Tor includes previously gathered statistics in

+ 1 - 1
src/or/config.c

@@ -289,7 +289,7 @@ static config_var_t option_vars_[] = {
   VAR("HiddenServiceMaxStreams",LINELIST_S, RendConfigLines, NULL),
   VAR("HiddenServiceMaxStreams",LINELIST_S, RendConfigLines, NULL),
   VAR("HiddenServiceMaxStreamsCloseCircuit",LINELIST_S, RendConfigLines, NULL),
   VAR("HiddenServiceMaxStreamsCloseCircuit",LINELIST_S, RendConfigLines, NULL),
   VAR("HiddenServiceNumIntroductionPoints", LINELIST_S, RendConfigLines, NULL),
   VAR("HiddenServiceNumIntroductionPoints", LINELIST_S, RendConfigLines, NULL),
-  V(HiddenServiceStatistics,     BOOL,     "0"),
+  V(HiddenServiceStatistics,     BOOL,     "1"),
   V(HidServAuth,                 LINELIST, NULL),
   V(HidServAuth,                 LINELIST, NULL),
   V(CloseHSClientCircuitsImmediatelyOnTimeout, BOOL, "0"),
   V(CloseHSClientCircuitsImmediatelyOnTimeout, BOOL, "0"),
   V(CloseHSServiceRendCircuitsImmediatelyOnTimeout, BOOL, "0"),
   V(CloseHSServiceRendCircuitsImmediatelyOnTimeout, BOOL, "0"),