commit 24f170a11f59e26dec3a24d076b749c8acc793ca Merge: 028cac9 915c743 Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 28 10:19:16 2015 -0400

Merge branch 'feature6411_v4'

changes/feature6411 | 7 + src/common/crypto.c | 72 ++++++++ src/common/crypto.h | 3 + src/or/connection.c | 7 + src/or/control.c | 405 ++++++++++++++++++++++++++++++++++++++++++++ src/or/control.h | 5 + src/or/or.h | 3 + src/or/rendservice.c | 301 +++++++++++++++++++++++++++----- src/or/rendservice.h | 19 +++ src/test/include.am | 1 + src/test/test.c | 4 +- src/test/test_controller.c | 161 ++++++++++++++++++ src/test/test_crypto.c | 37 ++++ 13 files changed, 980 insertions(+), 45 deletions(-)