Merge branch 'feature15652_squashed'

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

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

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

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