commit 657efebc950e737c3ecf281650d134a99990835c Merge: 6d968a1 b31f0e1 Author: Nick Mathewson nickm@torproject.org Date: Mon Oct 24 12:48:02 2016 -0400

Merge remote-tracking branch 'pastly/ticket20273'

dir-spec.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)