non-bottleneck update
testing config: 1 client with 1 bulk download
Merge branch 'master' of https://github.com/torsimulator/gmu-tor