Merge remote-tracking branch 'dgoulet/bug15254_027_01'

This commit is contained in:
Nick Mathewson 2015-09-02 09:05:55 -04:00
commit f273295cad
3 changed files with 6 additions and 2 deletions

View File

@ -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.

View File

@ -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

View File

@ -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"),