diff options
| -rw-r--r-- | control-spec.txt | 4 | ||||
| -rw-r--r-- | dir-spec.txt | 24 | ||||
| -rw-r--r-- | proposals/000-index.txt | 4 | ||||
| -rw-r--r-- | proposals/126-geoip-reporting.txt | 19 |
4 files changed, 44 insertions, 7 deletions
diff --git a/control-spec.txt b/control-spec.txt index 6c0379b..60e5a78 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -524,6 +524,10 @@ $Id$ A space-separated list of all the events supported by this version of Tor's USEFEATURE. + "ip-to-country/*" + Maps IP addresses to 2-letter country codes. For example, + "GETINFO ip-to-country/18.0.0.1" should give "US". + "next-circuit/IP:port" XXX todo. diff --git a/dir-spec.txt b/dir-spec.txt index 8e2ddec..4e482ba 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -599,6 +599,21 @@ $Id$ As documented in 2.1 above. See migration notes in section 2.2.1. + "geoip-start" YYYY-MM-DD HH:MM:SS NL + "geoip-client-origins" CC=N,CC=N,... NL + + Only generated by bridge routers (see blocking.pdf), and only + when they have been configured with a geoip database. + Non-bridges SHOULD NOT generate these fields. Contains a list + of mappings from two-letter country codes (CC) to the number + of clients that have connected to that bridge from that + country (approximate, and rounded to the nearest multiple of 8 + in order to hamper traffic analysis). A country is included + only if it has at least 8 addresses, and only if the bridge + has seen at least 16 addresses total. The time in + "geoip-start" is the time at which we began collecting geoip + statistics. + "router-signature" NL Signature NL [At end, exactly once.] @@ -613,10 +628,11 @@ $Id$ tools SHOULD accept history values from both sources; if they appear in both documents, the values in the extra-info documents are authoritative. - At some future time, to save space, new versions of Tor will no longer - generate router descriptors containing read-history or write-history. - Tools should continue to accept read-history and write-history values - in router descriptors produced by older versions of Tor. + New versions of Tor no longer generate router descriptors + containing read-history or write-history. Tools should continue to + accept read-history and write-history values in router descriptors + produced by older versions of Tor until all Tor versions earlier + than 0.2.0.x are obsolete. 2.3. Nonterminals in router descriptors diff --git a/proposals/000-index.txt b/proposals/000-index.txt index 4b7a4fa..3354436 100644 --- a/proposals/000-index.txt +++ b/proposals/000-index.txt @@ -48,7 +48,7 @@ Proposals by number: 123 Naming authorities automatically create bindings [CLOSED] 124 Blocking resistant TLS certificate usage [SUPERSEDED] 125 Behavior for bridge users, bridge relays, and bridge authorities [FINISHED] -126 Getting GeoIP data and publishing usage summaries [FINISHED] +126 Getting GeoIP data and publishing usage summaries [CLOSED] 127 Relaying dirport requests to Tor download site / website [DRAFT] 128 Families of private bridges [DRAFT] 129 Block Insecure Protocols by Default [FINISHED] @@ -82,7 +82,6 @@ Proposals by status: 105 Version negotiation for the Tor protocol 111 Prioritizing local traffic over relayed traffic 125 Behavior for bridge users, bridge relays, and bridge authorities - 126 Getting GeoIP data and publishing usage summaries 129 Block Insecure Protocols by Default 130 Version 2 Tor connection protocol CLOSED: @@ -98,6 +97,7 @@ Proposals by status: 119 New PROTOCOLINFO command for controllers 122 Network status entries need a new Unnamed flag 123 Naming authorities automatically create bindings + 126 Getting GeoIP data and publishing usage summaries SUPERSEDED: 112 Bring Back Pathlen Coin Weight 124 Blocking resistant TLS certificate usage diff --git a/proposals/126-geoip-reporting.txt b/proposals/126-geoip-reporting.txt index 544f658..880a8b4 100644 --- a/proposals/126-geoip-reporting.txt +++ b/proposals/126-geoip-reporting.txt @@ -4,7 +4,13 @@ Version: $Revision$ Last-Modified: $Date$ Author: Roger Dingledine Created: 2007-11-24 -Status: Finished +Status: Closed + +0. Status + + In 0.2.0.x, this proposal is implemented to the extent needed to + address its motivations. See notes below with the test "RESOLUTION" + for details. 1. Background and motivation @@ -114,6 +120,9 @@ Status: Finished The IP-to-country details are described further in Sections 5 and 6 below. + [RESOLUTION: The geoip file in 0.2.0.x is not distributed through + Tor. Instead, it is shipped with the bundle.] + 4.2. The IP-to-city db In an ideal world, the IP-to-city db would be small enough that we @@ -140,6 +149,8 @@ Status: Finished there another reasonable location for it that can provide similar consensus security properties? + [RESOLUTION: IP-to-city is not supported.] + 4.2.1. Controllers can query for router annotations Vidalia needs to stop doing queries on bridge relay IP addresses. @@ -202,6 +213,8 @@ Status: Finished [XXX Should consider forward/backward compatibility, e.g. if we want to move to a new geoip file format. -RD] + [RESOLUTION: Not done over Tor.] + 6. Controllers use the IP-to-country db for mapping and for path building Down the road, Vidalia could use the IP-to-country mappings for placing @@ -221,6 +234,8 @@ Status: Finished GETINFO ip-to-country/128.31.0.34 250+ip-to-country/128.31.0.34="US","USA","UNITED STATES" + [RESOLUTION: Not done now, except for the getinfo command.] + 6.1. Other interfaces Robert Hogan has also suggested a @@ -230,6 +245,8 @@ Status: Finished as well as torrc options for ExitCountryCodes, EntryCountryCodes, ExcludeCountryCodes, etc. + [RESOLUTION: Not implemented in 0.2.0.x. Fodder for a future proposal.] + 7. Relays and bridges use the IP-to-country db for usage summaries Once bridges have a GeoIP database locally, they can start to publish |