commit 2b4d4ccb3d1ecf984012b39eb361307785b0c1c0 Merge: d86a45f 69ab7cd Author: Nick Mathewson <nickm@torproject.org> Date: Mon Feb 11 11:28:08 2013 -0500 Merge remote-tracking branch 'public/bug7801_v2' changes/bug7801 | 13 +++++++++++++ src/common/compat.c | 24 ------------------------ src/common/compat.h | 5 ----- src/common/crypto.c | 8 ++++---- src/common/crypto.h | 2 ++ src/common/util.c | 42 ++++++++++++++++++++++++++++++++++++++++++ src/common/util.h | 14 ++++++++++++++ src/or/cpuworker.c | 11 +++++++++-- src/or/main.c | 1 + src/or/relay.c | 31 ++++++++++++++++++++++++++++--- src/or/relay.h | 2 ++ src/test/test_util.c | 29 +++++++++++++++++++++++++++++ 12 files changed, 144 insertions(+), 38 deletions(-)