summaryrefslogtreecommitdiff
path: root/src/or/router.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-10-27 12:12:16 -0400
committerNick Mathewson <nickm@torproject.org>2014-10-27 12:12:16 -0400
commit0793ef862b4991281bcb9155f0d15a3930889bea (patch)
tree968bc0b205e3afa86de57cb6288252605f95563c /src/or/router.h
parent682c154cc49a4219ee9828cb9b0cc4339102cbc5 (diff)
parent909aa51b3f4411b30bccbbf1dd9f876d150167fd (diff)
downloadtor-0793ef862b4991281bcb9155f0d15a3930889bea.tar.gz
tor-0793ef862b4991281bcb9155f0d15a3930889bea.zip
Merge remote-tracking branch 'sebastian/bug13286'
Diffstat (limited to 'src/or/router.h')
-rw-r--r--src/or/router.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/or/router.h b/src/or/router.h
index d18ff065ea..cedbc08914 100644
--- a/src/or/router.h
+++ b/src/or/router.h
@@ -32,10 +32,8 @@ crypto_pk_t *init_key_from_file(const char *fname, int generate,
int severity);
void v3_authority_check_key_expiry(void);
-#ifdef CURVE25519_ENABLED
di_digest256_map_t *construct_ntor_key_map(void);
void ntor_key_map_free(di_digest256_map_t *map);
-#endif
int router_initialize_tls_context(void);
int init_keys(void);