commit 1fb4cb58e98af3d4ac153efe6d0ddc43665d9a74 Merge: c0b2dc9 2cce07d Author: Nick Mathewson nickm@torproject.org Date: Tue Jul 17 08:49:30 2018 -0400

Merge remote-tracking branch 'teor/bug26799'

dir-spec.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)