From: Andrea Shepard <andrea@torproject.org>
Date: Thu, 24 Jan 2013 16:10:12 +0000 (-0800)
Subject: Merge branch 'time_based_onionqueue_v2' of ssh://git-rw.torproject.org/nickm/tor
X-Git-Tag: tor-0.2.4.10-alpha~20
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dfbd19df418347d833df650e68367c96a3aa37ad;p=thirdparty%2Ftor.git

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

dfbd19df418347d833df650e68367c96a3aa37ad
diff --cc src/or/or.h
index a6f3d3e88a,01205ee66f..251512dd31
--- 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 {