commit b3abfdffeef063a3672679fb092a4d9ff08a605b Merge: d31c33c d29d9ad Author: Nick Mathewson nickm@torproject.org Date: Tue Jul 17 08:45:48 2018 -0400

Merge remote-tracking branch 'teor/ticket21377-squashed'

dir-spec.txt | 35 ++++++++++--- proposals/xxx-expose-bandwidth-files.txt | 85 ++++++++++++++++++++++++++++++++ 2 files changed, 113 insertions(+), 7 deletions(-)