commit d4e2ccc387bbcc2184ae027fa0fccc897a9f51c3 Merge: 43b8132 0e35e92 Author: Nick Mathewson nickm@torproject.org Date: Tue Jul 31 17:09:47 2012 -0400

Merge branch 'bug6177_squashed'

changes/bug6177 | 5 + src/or/Makefile.am | 2 + src/or/or.h | 16 +- src/or/rendcommon.c | 2 +- src/or/rendservice.c | 1254 ++++++++++++++++++++++++++++++++++++--------- src/or/rendservice.h | 73 +++ src/or/replaycache.c | 215 ++++++++ src/or/replaycache.h | 66 +++ src/test/Makefile.am | 2 + src/test/test.c | 4 + src/test/test_introduce.c | 528 +++++++++++++++++++ src/test/test_replay.c | 184 +++++++ 12 files changed, 2101 insertions(+), 250 deletions(-)