[tor-commits] [torspec/master] Merge remote-tracking branch 'teor/ticket26829'

[nickm at torproject.org]

commit e9b22d7e3e95de6a1ce891601af0b585ac4e1e6e
Merge: 2d33e5f cc7ef26
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Aug 13 06:22:10 2018 -0400

    Merge remote-tracking branch 'teor/ticket26829'

 bandwidth-file-spec.txt | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)