| 
					
				 | 
			
			
				@@ -1743,8 +1743,9 @@ connection_or_client_learned_peer_id(or_connection_t *conn, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   return 0; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-/** Return when a client used this, for connection.c, since client_used 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- * is now one of the timestamps of channel_t */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+/** Return when we last used this channel for client activity (origin 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ * circuits). This is called from connection.c, since client_used is now one 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ * of the timestamps in channel_t */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 time_t 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 connection_or_client_used(or_connection_t *conn) 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1758,7 +1759,7 @@ connection_or_client_used(or_connection_t *conn) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 /** The v1/v2 TLS handshake is finished. 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  * 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- * Make sure we are happy with the person we just handshaked with. 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ * Make sure we are happy with the peer we just handshaked with. 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  * 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  * If they initiated the connection, make sure they're not already connected, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  * then initialize conn from the information in router. 
			 |