commit 4df184021b7c84cc47e2ed19a601b1e790b5b4fb Merge: 72bb3d3 ded4213 Author: Nick Mathewson nickm@torproject.org Date: Sun Jun 17 20:44:03 2018 -0400

Merge remote-tracking branch 'juga/ticket26200'

bandwidth-file-spec.txt | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-)