Merge branch 'spooling_squashed'

diff --cc src/or/connection.c
Simple merge

diff --cc src/or/directory.c
Simple merge

diff --cc src/or/directory.h
Simple merge

diff --cc src/or/dirserv.c
Simple merge

diff --cc src/or/dirserv.h
Simple merge

diff --cc src/or/microdesc.c
Simple merge

diff --cc src/or/microdesc.h
Simple merge

diff --cc src/or/or.h
Simple merge

diff --cc src/test/test_dir_handle_get.c
Simple merge