diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-05-19 15:56:31 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-05-19 15:56:31 -0400 |
| commit | 0d6f293e0e5ca7ae57347d8879a6ba7805a2cac3 (patch) | |
| tree | 2468f0cea8949fe07e1279f06788c814907e4e43 /src/or/or.h | |
| parent | dd17df2253fb0592ed3f75f8cf5134b71800df62 (diff) | |
| parent | 2729f166cb715f0f4aff8779f0fadebafc56a70c (diff) | |
| download | tor-0d6f293e0e5ca7ae57347d8879a6ba7805a2cac3.tar.gz tor-0d6f293e0e5ca7ae57347d8879a6ba7805a2cac3.zip | |
Merge remote-tracking branch 'public/bug19073' into 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 aa93c1c030..2252f38161 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2117,9 +2117,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; @@ -2195,9 +2192,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; |