|  | @@ -237,7 +237,7 @@ int router_nickname_matches(routerinfo_t *router, const char *nickname)
 | 
	
		
			
				|  |  |   */
 | 
	
		
			
				|  |  |  routerinfo_t *router_get_by_nickname(const char *nickname)
 | 
	
		
			
				|  |  |  {
 | 
	
		
			
				|  |  | -  int i, maybedigest, mustbedigest;
 | 
	
		
			
				|  |  | +  int i, maybedigest;
 | 
	
		
			
				|  |  |    routerinfo_t *router;
 | 
	
		
			
				|  |  |    char digest[DIGEST_LEN];
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -562,7 +562,8 @@ int router_load_routerlist_from_directory(const char *s,
 | 
	
		
			
				|  |  |  static int
 | 
	
		
			
				|  |  |  router_resolve(routerinfo_t *router)
 | 
	
		
			
				|  |  |  {
 | 
	
		
			
				|  |  | -  if (tor_lookup_hostname(router->address, &router->addr) != 0) {
 | 
	
		
			
				|  |  | +  if (tor_lookup_hostname(router->address, &router->addr) != 0
 | 
	
		
			
				|  |  | +      || !router->addr) {
 | 
	
		
			
				|  |  |      log_fn(LOG_WARN,"Could not get address for router %s (%s).",
 | 
	
		
			
				|  |  |             router->address, router->nickname);
 | 
	
		
			
				|  |  |      return -1;
 |