aboutsummaryrefslogtreecommitdiff
path: root/src/or/router.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-11-29 18:30:41 -0500
committerNick Mathewson <nickm@torproject.org>2011-11-29 18:30:41 -0500
commitda6c136817983e30349e9733891239b05aa66f09 (patch)
tree5c5af254f33ddfdbf8f004410f00ea131b280880 /src/or/router.h
parent83f66db79ec6469beea0fb410be6536acb90ffd0 (diff)
parent055d6c01fff3324dbb38c2d81ad49ccfdb5432c2 (diff)
downloadtor-da6c136817983e30349e9733891239b05aa66f09.tar.gz
tor-da6c136817983e30349e9733891239b05aa66f09.zip
Merge remote-tracking branch 'asn-mytor/bug4548_take2'
Diffstat (limited to 'src/or/router.h')
-rw-r--r--src/or/router.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/router.h b/src/or/router.h
index 8cc529f86f..6a9851cdbd 100644
--- a/src/or/router.h
+++ b/src/or/router.h
@@ -30,6 +30,7 @@ crypto_pk_env_t *init_key_from_file(const char *fname, int generate,
int severity);
void v3_authority_check_key_expiry(void);
+int router_initialize_tls_context(void);
int init_keys(void);
int check_whether_orport_reachable(void);