Merge branch 'bug17795'

diff --cc src/common/crypto.c
Simple merge

diff --cc src/common/crypto.h
Simple merge

diff --cc src/common/tortls.c
Simple merge

diff --cc src/common/tortls.h
Simple merge

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

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

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

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

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

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

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