commit f273295cadd1afe03c0e839ce51f0d00bf2b43d6 Merge: db5a930 d40358d Author: Nick Mathewson <nickm@torproject.org> Date: Wed Sep 2 09:05:55 2015 -0400 Merge remote-tracking branch 'dgoulet/bug15254_027_01' changes/ticket15254-hs-stats-default | 4 ++++ doc/tor.1.txt | 2 +- src/or/config.c | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-)