commit 208c2a5c74e5ae4e53a9c6555f5519816826d490 Merge: 4d5b46a 003a7fe Author: Nick Mathewson nickm@torproject.org Date: Tue Mar 28 19:55:18 2017 +0200

Merge branch 'spooling_squashed'

changes/new_spooling_backend | 7 + src/or/connection.c | 8 +- src/or/directory.c | 213 +++++++---- src/or/directory.h | 9 +- src/or/dirserv.c | 818 +++++++++++++++++++++-------------------- src/or/dirserv.h | 74 +++- src/or/microdesc.c | 12 - src/or/microdesc.h | 2 - src/or/or.h | 24 +- src/test/test_dir_handle_get.c | 17 +- 10 files changed, 660 insertions(+), 524 deletions(-)