Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update the data in the readme from 2020 to 2023 #105

Merged
merged 1 commit into from
May 10, 2023
Merged

Update the data in the readme from 2020 to 2023 #105

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,17 +79,17 @@ and we don't want to introduce the overhead of following a more strict policy th

### grab the data we need

wget https://collector.torproject.org/archive/relay-descriptors/consensuses/consensuses-2020-11.tar.xz
wget https://collector.torproject.org/archive/relay-descriptors/server-descriptors/server-descriptors-2020-11.tar.xz
wget https://collector.torproject.org/archive/relay-descriptors/consensuses/consensuses-2023-04.tar.xz
wget https://collector.torproject.org/archive/relay-descriptors/server-descriptors/server-descriptors-2023-04.tar.xz
wget https://metrics.torproject.org/userstats-relay-country.csv
wget https://collector.torproject.org/archive/onionperf/onionperf-2020-11.tar.xz
wget -O bandwidth-2020-11.csv "https://metrics.torproject.org/bandwidth.csv?start=2020-11-01&end=2020-11-30"
wget https://collector.torproject.org/archive/onionperf/onionperf-2023-04.tar.xz
wget -O bandwidth-2023-04.csv "https://metrics.torproject.org/bandwidth.csv?start=2023-04-01&end=2023-04-30"

### extract

tar xaf consensuses-2020-11.tar.xz
tar xaf server-descriptors-2020-11.tar.xz
tar xaf onionperf-2020-11.tar.xz
tar xaf consensuses-2023-04.tar.xz
tar xaf server-descriptors-2023-04.tar.xz
tar xaf onionperf-2023-04.tar.xz

### we also utilize privcount Tor traffic model measurements

Expand Down Expand Up @@ -119,21 +119,21 @@ tools. On Ubuntu these can be installed with:
### stage first, process relay and user info

tornettools stage \
consensuses-2020-11 \
server-descriptors-2020-11 \
consensuses-2023-04 \
server-descriptors-2023-04 \
userstats-relay-country.csv \
tmodel-ccs2018.github.io \
--onionperf_data_path onionperf-2020-11 \
--bandwidth_data_path bandwidth-2020-11.csv \
--onionperf_data_path onionperf-2023-04 \
--bandwidth_data_path bandwidth-2023-04.csv \
--geoip_path tor/src/config/geoip

### now we can used the staged files to generate many times

For example, use `--network_scale 0.01` to generate a private Tor network at '1%' the scale of public Tor:

tornettools generate \
relayinfo_staging_2020-11-01--2020-11-30.json \
userinfo_staging_2020-11-01--2020-11-30.json \
relayinfo_staging_2023-04-01--2023-04-30.json \
userinfo_staging_2023-04-01--2023-04-30.json \
networkinfo_staging.gml \
tmodel-ccs2018.github.io \
--network_scale 0.01 \
Expand All @@ -149,7 +149,7 @@ Note that simulating a '1%' Tor network for 60 simulation minutes can take as mu
tornettools parse tornet-0.01
tornettools plot \
tornet-0.01 \
--tor_metrics_path tor_metrics_2020-11-01--2020-11-30.json \
--tor_metrics_path tor_metrics_2023-04-01--2023-04-30.json \
--prefix pdfs
tornettools archive tornet-0.01

Expand Down