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

diff --cc src/or/config.c
Simple merge

diff --cc src/or/cpuworker.c
Simple merge

diff --cc src/or/cpuworker.h
Simple merge

diff --cc src/or/main.c
Simple merge

diff --cc src/or/onion.c
Simple merge

diff --cc src/or/or.h
index a6f3d3e88ab4ae041ac70b076887de045072718f,01205ee66f12787ec917d82172a48e6dfaa49e76..251512dd315a97451531b4a16eff0c4cdbb55ca0
--- 1/src/or/or.h
--- 2/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 {