aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-08-12 13:35:53 -0400
committerNick Mathewson <nickm@torproject.org>2015-08-12 13:35:53 -0400
commit6b2696296640585bb6247ff6c88570c38b4b25a8 (patch)
treedac6f071aa125bc6580b477f5e9d667bd9c0b5bd /src
parent2088b3b8e28003fa74989a337dc67f41ef19e1c7 (diff)
parent9deb3c61feb85563aeb336fec97fa3845a193f08 (diff)
downloadtor-6b2696296640585bb6247ff6c88570c38b4b25a8.tar.gz
tor-6b2696296640585bb6247ff6c88570c38b4b25a8.zip
Merge branch 'bug16539'
Diffstat (limited to 'src')
-rw-r--r--src/or/routerlist.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index dc48862201..aebbd480d2 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -3295,6 +3295,8 @@ router_add_to_routerlist(routerinfo_t *router, const char **msg,
/* Make sure that it isn't expired. */
if (router->cert_expiration_time < approx_time()) {
+ routerinfo_free(router);
+ *msg = "Some certs on this router are expired.";
return ROUTER_CERTS_EXPIRED;
}