commit 6e9a14b030bc1a7b9d2919bda637d01ea34fc021 Merge: 7954202 63676e7 Author: Nick Mathewson nickm@torproject.org Date: Wed Jan 23 11:15:26 2019 -0500

Merge remote-tracking branch 'tor-github/pr/51'

bandwidth-file-spec.txt | 756 ++++++++++++++++++++++++------------------------ 1 file changed, 384 insertions(+), 372 deletions(-)