commit fd9420426f02001cd1524ee68895b14102d4dbd5 Author: Ana Custura ana@netstat.org.uk Date: Thu May 14 17:06:12 2020 +0100

Removes tpf mentions from the documentation --- README.md | 9 +-------- onionperf/onionperf | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md index d7ff81b..9f7e872 100644 --- a/README.md +++ b/README.md @@ -226,14 +226,7 @@ subcommand (which is described in more detail below). The analysis produces a contextual information collected during the measurement process. The `README_JSON.md` file in this repo describes the format and elements contained in the `json` file.

-The analysis also produces a `.tpf` file in the standard Torperf format -(`type torperf 1.0`) which contains a subset of the measurement data available in -the `json` file. This file is produced to increase interoperability with existing -tools written to process Torperf measurement results. More information regarding -how to read Torperf's measurements results can be found at: -https://metrics.torproject.org/collector.html#torperf. - -The daily generated `json` and `tpf` files are placed in the web docroot and are +The daily generated `json` files are placed in the web docroot and are available through the local filesystem in the `onionperf-data/htdocs` directory. These files can be shared via a web server such as Apache or nginx.

diff --git a/onionperf/onionperf b/onionperf/onionperf index 69ac399..ee28344 100755 --- a/onionperf/onionperf +++ b/onionperf/onionperf @@ -200,7 +200,7 @@ def main(): default=True)

measure_parser.add_argument('-n', '--nickname', - help="""the 'SOURCE' STRING to use in .tpf torperf stats files produced by OnionPerf""", + help="""the 'SOURCE' STRING to use in measurement result files produced by OnionPerf""", metavar="STRING", type=str, action="store", dest="nickname", default=hostname)