commit b88db7573cc342793b65e792649dca5c466bea9c Merge: 6a6233b ce51887 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Nov 18 18:42:49 2011 -0500 Merge remote-tracking branch 'public/benchmark' .gitignore | 2 + changes/bench | 6 + configure.in | 5 +- src/or/relay.c | 6 +- src/or/relay.h | 5 + src/test/Makefile.am | 12 ++- src/test/bench.c | 327 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/test/test.c | 98 --------------- 8 files changed, 355 insertions(+), 106 deletions(-)