summaryrefslogtreecommitdiff
path: root/src/or/router.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-12-19 10:35:47 -0500
committerNick Mathewson <nickm@torproject.org>2014-12-19 10:35:47 -0500
commit64787e99faa794463e2e9a162340aa457018d321 (patch)
tree964dbc206995595ffd807a8644209d823e261689 /src/or/router.c
parenteee248bc593ab57cd905195458dd2b64c94e9ac1 (diff)
parent13a6fb9a2aa499e160e2b7d71794d6f5614bbd19 (diff)
downloadtor-64787e99faa794463e2e9a162340aa457018d321.tar.gz
tor-64787e99faa794463e2e9a162340aa457018d321.zip
Merge branch 'asn-karsten-task-13192-5-squashed'
Diffstat (limited to 'src/or/router.c')
-rw-r--r--src/or/router.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/or/router.c b/src/or/router.c
index 56bb909952..7119a29d68 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -2658,6 +2658,11 @@ extrainfo_dump_to_string(char **s_out, extrainfo_t *extrainfo,
"dirreq-stats-end", now, &contents) > 0) {
smartlist_add(chunks, contents);
}
+ if (options->HiddenServiceStatistics &&
+ load_stats_file("stats"PATH_SEPARATOR"hidserv-stats",
+ "hidserv-stats-end", now, &contents) > 0) {
+ smartlist_add(chunks, contents);
+ }
if (options->EntryStatistics &&
load_stats_file("stats"PATH_SEPARATOR"entry-stats",
"entry-stats-end", now, &contents) > 0) {