Merge branch 'bug15604_squashed'

This commit is contained in:
Nick Mathewson
2015-04-07 15:15:54 -04:00
2 changed files with 8 additions and 0 deletions
+7
View File
@@ -0,0 +1,7 @@
o Minor bugfixes
- Disregard the ConnDirectionStatistics torrc options when Tor is
not a relay since in that mode of operation no sensible data is
being collected and because Tor might run into measurement hiccups
when running as a client for some time, then becoming a relay. Fixes
bug 15604; bugfix on 0.2.2.35.