commit b73d8833e4215fe9bb4ac98c6ba909d8d9ca03f1 Merge: a7ef86a 5c82d5e Author: Nick Mathewson nickm@torproject.org Date: Fri May 19 09:30:46 2017 -0400

Merge remote-tracking branch 'jigsaw/torrc-dir-fix-1922_squashed'

control-spec.txt | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)