commit 78fdde420a9a8bf2d6584cca6a4c557973743485 Merge: d41a32a a9138a0 Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 26 16:52:40 2018 -0500

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

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