commit a2ef62c2b7d1406f72ac87769ce0396f543146d8 Merge: c761ac6 c1cd60e Author: Karsten Loesing karsten.loesing@gmx.net Date: Thu Jul 16 09:55:36 2020 +0200

Merge branch 'task-40005' into develop

onionperf/analysis.py | 76 ++++++++++++------------------------ onionperf/measurement.py | 2 +- onionperf/onionperf | 9 +---- onionperf/reprocessing.py | 8 ++-- onionperf/tests/test_reprocessing.py | 2 +- 5 files changed, 33 insertions(+), 64 deletions(-)