[tor-commits] [torspec/master] Prop 312: Explain how to choose addresses

[teor at torproject.org]

commit f12ddad6bffd118c4759304d69f879e9829a52ca
Author: teor <teor at torproject.org>
Date:   Tue Feb 4 12:18:56 2020 +1000

    Prop 312: Explain how to choose addresses
    
    Explain how we choose between multiple addresses, in a list, and over
    time.
    
    Part of 33073.
---
 proposals/312-relay-auto-ipv6-addr.txt | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/proposals/312-relay-auto-ipv6-addr.txt b/proposals/312-relay-auto-ipv6-addr.txt
index ecea79b..752a0be 100644
--- a/proposals/312-relay-auto-ipv6-addr.txt
+++ b/proposals/312-relay-auto-ipv6-addr.txt
@@ -114,8 +114,9 @@ Ticket: #33073
 
    If there are multiple valid addresses, tor chooses:
      * the first address returned by the resolver,
-     * the first address returned by the local interface API, or
-     * the latest address returned by a directory server.
+     * the first address returned by the local interface API, and
+     * the latest address(es) returned by a directory server, DNS, or the
+       local interface API.
 
 3.2. Finding Relay IPv6 Addresses
 
@@ -157,8 +158,10 @@ Ticket: #33073
    While making these changes, we want to preserve tor's existing behaviour:
      * resolve Address using the local resolver, if needed,
      * ignore private addresses on public tor networks, and
-     * when there are multiple valid addresses, choose the first or latest
-       address, as appropriate.
+     * when there are multiple valid addresses:
+       * if a list of addresses is received, choose the first address, and
+       * if different addresses are received over time, choose the most recent
+         address.
 
 3.2.1. Make the Address torrc Option Support IPv6