commit 14dea86acc6b00fdfa8985f3728bb6bba0c7c711 Merge: ed29ac2 b4aa080 Author: Nick Mathewson nickm@torproject.org Date: Mon Jun 25 10:02:39 2018 -0400

Merge remote-tracking branch 'juga/ticket26155'

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