Merge branch 'bug24914'

diff --cc configure.ac
Simple merge

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

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

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