[tor-commits] [torspec/master] Merge remote-tracking branch 'juga/ticket8494'

[nickm at torproject.org]

commit f3b7ffa27da3f25ccb6c204b5c541ee3fa0a1976
Merge: 14dea86 1aab99d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 25 10:06:55 2018 -0400

    Merge remote-tracking branch 'juga/ticket8494'

 bandwidth-file-spec.txt | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)