Merge remote-tracking branch 'public/bug15745_027_03'

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

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

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

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

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