commit d41a32ae35672aa19953b44d6d113ec357d0da8c Merge: bab8a89 a5292ee Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 26 16:51:52 2018 -0500

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

bandwidth-file-spec.txt | 140 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 135 insertions(+), 5 deletions(-)