commit 77ef388e86ea678ec0bc747c898e3fff698b444e Merge: 463732e 22cda72 Author: Nick Mathewson nickm@torproject.org Date: Tue May 6 20:43:01 2014 -0400

Merge remote-tracking branch 'public/bug11743_option_b'

dir-spec.txt | 13 +++++++++++++ 1 file changed, 13 insertions(+)