diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-09-02 09:05:55 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-09-02 09:05:55 -0400 |
| commit | f273295cadd1afe03c0e839ce51f0d00bf2b43d6 (patch) | |
| tree | 2b174a785224739e6d8d834867cf81d9dab4c1f9 | |
| parent | db5a9302c17b5bed91987fdeaaa0377e46e4811e (diff) | |
| parent | d40358d91ed62590a84730fb2713b8a0115c5adf (diff) | |
| download | tor-f273295cadd1afe03c0e839ce51f0d00bf2b43d6.tar.gz tor-f273295cadd1afe03c0e839ce51f0d00bf2b43d6.zip | |
Merge remote-tracking branch 'dgoulet/bug15254_027_01'
| -rw-r--r-- | changes/ticket15254-hs-stats-default | 4 | ||||
| -rw-r--r-- | doc/tor.1.txt | 2 | ||||
| -rw-r--r-- | src/or/config.c | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/changes/ticket15254-hs-stats-default b/changes/ticket15254-hs-stats-default new file mode 100644 index 0000000000..14913ea604 --- /dev/null +++ b/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. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index af99570bd4..735fa239a1 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1848,7 +1848,7 @@ is non-zero): statistics on its role as hidden-service directory, introduction point, or rendezvous point to disk every 24 hours. If 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**:: When this option is enabled, Tor includes previously gathered statistics in diff --git a/src/or/config.c b/src/or/config.c index 6e782de0e0..cb0abab613 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -289,7 +289,7 @@ static config_var_t option_vars_[] = { VAR("HiddenServiceMaxStreams",LINELIST_S, RendConfigLines, NULL), VAR("HiddenServiceMaxStreamsCloseCircuit",LINELIST_S, RendConfigLines, NULL), VAR("HiddenServiceNumIntroductionPoints", LINELIST_S, RendConfigLines, NULL), - V(HiddenServiceStatistics, BOOL, "0"), + V(HiddenServiceStatistics, BOOL, "1"), V(HidServAuth, LINELIST, NULL), V(CloseHSClientCircuitsImmediatelyOnTimeout, BOOL, "0"), V(CloseHSServiceRendCircuitsImmediatelyOnTimeout, BOOL, "0"), |