[tor-commits] [onionperf/master] Tweak #33399 patch.

[karsten at torproject.org]

commit dfec0b8960ac214f63985dfc317ffce750ef5922
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Thu Aug 20 15:40:25 2020 +0200

    Tweak #33399 patch.
    
     - Add a change log entry.
     - Pick are more sensible default for `drop_guards_interval_hours`,
       also to fix unit tests.
---
 CHANGELOG.md             | 5 +++++
 onionperf/measurement.py | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b8a86ee..c31a40e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# Changes in version 0.7 - 2020-??-??
+
+ - Add `onionperf measure --drop-guards` parameter to use and drop
+   guards after a given number of hours. Implements #33399.
+
 # Changes in version 0.6 - 2020-08-08
 
  - Update to TGen 1.0.0, use TGenTools for parsing TGen log files, and
diff --git a/onionperf/measurement.py b/onionperf/measurement.py
index 1a5f3bb..709fbc6 100644
--- a/onionperf/measurement.py
+++ b/onionperf/measurement.py
@@ -173,7 +173,7 @@ def logrotate_thread_task(writables, tgen_writable, torctl_writable, docroot, ni
 
 class Measurement(object):
 
-    def __init__(self, tor_bin_path, tgen_bin_path, datadir_path, privatedir_path, nickname, oneshot, additional_client_conf=None, torclient_conf_file=None, torserver_conf_file=None, single_onion=False, drop_guards_interval_hours=None):
+    def __init__(self, tor_bin_path, tgen_bin_path, datadir_path, privatedir_path, nickname, oneshot, additional_client_conf=None, torclient_conf_file=None, torserver_conf_file=None, single_onion=False, drop_guards_interval_hours=0):
         self.tor_bin_path = tor_bin_path
         self.tgen_bin_path = tgen_bin_path
         self.datadir_path = datadir_path