Merge branch 'bug6177_squashed'

changes/bug6177

src/or/Makefile.am

src/or/or.h

src/or/rendcommon.c

src/or/rendservice.c

src/or/rendservice.h

src/or/replaycache.c

src/or/replaycache.h

src/test/Makefile.am

src/test/test.c

src/test/test_introduce.c

src/test/test_replay.c