Merge branch 'hardware_accel_improvements'

diff --cc ChangeLog
Simple merge

diff --cc doc/tor.1.in
Simple merge

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

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

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

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

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

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

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