Merge branch 'feature6411_v4'

changes/feature6411

src/common/crypto.c

src/common/crypto.h

src/or/connection.c

src/or/control.c

src/or/control.h

src/or/or.h

src/or/rendservice.c

src/or/rendservice.h

src/test/include.am

src/test/test.c

src/test/test_controller.c

src/test/test_crypto.c