commit 7ff38a15c5d6dbefffc256b8df897feade8489a5 Merge: e19176c f0b5c98 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Jan 12 12:15:11 2016 -0500 Merge remote-tracking branch 'public/bug16227' dir-spec.txt | 32 +++++++++++++++++++++++++++ proposals/237-directory-servers-for-all.txt | 3 +++ rend-spec.txt | 15 ++++++++++++- 3 files changed, 49 insertions(+), 1 deletion(-)