commit 3031def7268ce0cc6f3ab015c0df382295494bb9 Author: Roger Dingledine <arma@torproject.org> Date: Thu Mar 29 16:45:25 2012 -0400 checking "same addr/port but with nonmatching keys" is obsolete Specifically, I believe it dates back to when extend cells had address:port but no digest in them. The special edge case is certainly not worth the complexity these days. --- src/or/dirserv.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 467129c..dfecbc8 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -3271,16 +3271,11 @@ dirserv_orconn_tls_done(const char *address, uint16_t or_port, const char *digest_rcvd) { - routerinfo_t *ri = NULL; + routerinfo_t *ri = router_get_mutable_by_digest(digest_rcvd); time_t now = time(NULL); tor_assert(address); tor_assert(digest_rcvd); - /* FFFF Maybe we should reinstate the code that dumps routers with the same - * addr/port but with nonmatching keys, but instead of dumping, we should - * skip testing. */ - - ri = router_get_mutable_by_digest(digest_rcvd); if (ri == NULL) return;