commit dfbd19df418347d833df650e68367c96a3aa37ad Merge: b415aba 677d182 Author: Andrea Shepard andrea@torproject.org Date: Thu Jan 24 08:10:12 2013 -0800

Merge branch 'time_based_onionqueue_v2' of ssh://git-rw.torproject.org/nickm/tor

changes/timed_onionqueue | 11 +++ doc/tor.1.txt | 6 +- src/or/config.c | 3 +- src/or/cpuworker.c | 169 ++++++++++++++++++++++++++++++++++++++++++- src/or/cpuworker.h | 5 ++ src/or/main.c | 3 + src/or/onion.c | 180 +++++++++++++++++++++++++++------------------- src/or/or.h | 10 ++- 8 files changed, 304 insertions(+), 83 deletions(-)

diff --cc src/or/or.h index a6f3d3e,01205ee..251512d --- a/src/or/or.h +++ b/src/or/or.h @@@ -2581,9 -2576,10 +2581,10 @@@ typedef enum

struct fast_handshake_state_t; struct ntor_handshake_state_t; -#define ONION_HANDSHAKE_TYPE_TAP 0x0000 +#define ONION_HANDSHAKE_TYPE_TAP 0x0000 #define ONION_HANDSHAKE_TYPE_FAST 0x0001 #define ONION_HANDSHAKE_TYPE_NTOR 0x0002 + #define MAX_ONION_HANDSHAKE_TYPE 0x0002 typedef struct { uint16_t tag; union {