diff options
author | Nick Mathewson <nickm@torproject.org> | 2016-05-19 15:56:39 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2016-05-19 15:56:39 -0400 |
commit | 4a14c2cfc7972db39da4fd3a72cfd64d036daf7b (patch) | |
tree | df7812c9ea3ea51bb66ab93fa7fc10a593cf020c /src/or/or.h | |
parent | a7a44f2db0b6732ed53a24186dc09eea50296a20 (diff) | |
parent | 0d6f293e0e5ca7ae57347d8879a6ba7805a2cac3 (diff) | |
download | tor-4a14c2cfc7972db39da4fd3a72cfd64d036daf7b.tar.gz tor-4a14c2cfc7972db39da4fd3a72cfd64d036daf7b.zip |
Merge branch 'maint-0.2.8'
Diffstat (limited to 'src/or/or.h')
-rw-r--r-- | src/or/or.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/or/or.h b/src/or/or.h index 24c3641dab..3c38d7c455 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2122,9 +2122,6 @@ typedef struct { crypto_pk_t *identity_pkey; /**< Public RSA key for signing. */ /** Public curve25519 key for onions */ curve25519_public_key_t *onion_curve25519_pkey; - /** Certificate for ed25519 signing key - * (XXXX duplicated in cache_info.) */ - struct tor_cert_st *signing_key_cert; /** What's the earliest expiration time on all the certs in this * routerinfo? */ time_t cert_expiration_time; @@ -2200,9 +2197,6 @@ typedef struct extrainfo_t { uint8_t digest256[DIGEST256_LEN]; /** The router's nickname. */ char nickname[MAX_NICKNAME_LEN+1]; - /** Certificate for ed25519 signing key - * (XXXX duplicated in cache_info.) */ - struct tor_cert_st *signing_key_cert; /** True iff we found the right key for this extra-info, verified the * signature, and found it to be bad. */ unsigned int bad_sig : 1; |