commit 52ae6ab0db3f425887b3e0988ff9f6eda94cbb2f Author: David Fifield <david@bamsoftware.com> Date: Thu Apr 25 00:00:17 2013 -0700 New facilitator domain fp-facilitator.org. See https://trac.torproject.org/projects/tor/ticket/7160. --- README | 2 +- doc/flashproxy-reg-http.1.txt | 2 +- doc/flashproxy-reg-url.1.txt | 4 ++-- flashproxy-reg-http | 2 +- flashproxy-reg-url | 2 +- proxy/flashproxy.js | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README b/README index 5affeba..d3f7d52 100644 --- a/README +++ b/README @@ -69,7 +69,7 @@ public instance of it. This way is not as realistic because all your Tor traffic will first go to a fixed address and can be easily blocked. However this is an easy way to try out the system without having to do port forwarding. - $ tor ClientTransportPlugin "websocket socks4 tor-facilitator.bamsoftware.com:9999" UseBridges 1 Bridge "websocket 0.0.1.0:1" LearnCircuitBuildTimeout 0 CircuitBuildTimeout 60 + $ tor ClientTransportPlugin "websocket socks4 fp-facilitator.org:9999" UseBridges 1 Bridge "websocket 0.0.1.0:1" LearnCircuitBuildTimeout 0 CircuitBuildTimeout 60 == Troubleshooting diff --git a/doc/flashproxy-reg-http.1.txt b/doc/flashproxy-reg-http.1.txt index 77647e3..70cc13b 100644 --- a/doc/flashproxy-reg-http.1.txt +++ b/doc/flashproxy-reg-http.1.txt @@ -28,7 +28,7 @@ OPTIONS Name lookups use only IPv6. **-f**, **--facilitator**:: - Register with the given facilitator (by default "https://tor-facilitator.bamsoftware.com/"). + Register with the given facilitator (by default "https://fp-facilitator.org/"). **-h**, **--help**:: Display help message and exit. diff --git a/doc/flashproxy-reg-url.1.txt b/doc/flashproxy-reg-url.1.txt index 2ab9c85..88b12be 100644 --- a/doc/flashproxy-reg-url.1.txt +++ b/doc/flashproxy-reg-url.1.txt @@ -23,7 +23,7 @@ default __PORT__ is 9000. OPTIONS ------- **-f**, **--facilitator**=__URL__:: - Register with the given facilitator (by default "https://tor-facilitator.bamsoftware.com/"). + Register with the given facilitator (by default "https://fp-facilitator.org/"). **-h**, **--help**:: Display help message and exit. @@ -38,7 +38,7 @@ Say you wish to register 192.0.2.1:9000. Run The program should output a long string looking something like -https://tor-facilitator.bamsoftware.com/reg/0labtDob545HeKpLZ8LqGeOi-OK7HXoQvfQzj0P2pjh1NrCKNDaPe91zo\... +https://fp-facilitator.org/reg/0labtDob545HeKpLZ8LqGeOi-OK7HXoQvfQzj0P2pjh1NrCKNDaPe91zo\... Copy this string and paste it into any URL fetching website or program. Once the URL is retrieved your address will be registered with the facilitator. diff --git a/flashproxy-reg-http b/flashproxy-reg-http index 9c2f507..68fe46a 100755 --- a/flashproxy-reg-http +++ b/flashproxy-reg-http @@ -10,7 +10,7 @@ import urllib2 DEFAULT_REMOTE_ADDRESS = "" DEFAULT_REMOTE_PORT = 9000 -DEFAULT_FACILITATOR_URL = "https://tor-facilitator.bamsoftware.com/" +DEFAULT_FACILITATOR_URL = "https://fp-facilitator.org/" class options(object): remote_addr = None diff --git a/flashproxy-reg-url b/flashproxy-reg-url index a2aba34..75f6905 100755 --- a/flashproxy-reg-url +++ b/flashproxy-reg-url @@ -10,7 +10,7 @@ import urlparse from M2Crypto import RSA, BIO DEFAULT_REMOTE_PORT = 9000 -DEFAULT_FACILITATOR_URL = "https://tor-facilitator.bamsoftware.com/" +DEFAULT_FACILITATOR_URL = "https://fp-facilitator.org/" class options(object): facilitator_url = None diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index 56c1f0e..3011aa3 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -59,7 +59,7 @@ * http://autobahn.ws/testsuite/reports/clients/index.html */ -var DEFAULT_FACILITATOR_URL = "https://tor-facilitator.bamsoftware.com/"; +var DEFAULT_FACILITATOR_URL = "https://fp-facilitator.org/"; var DEFAULT_MAX_NUM_PROXY_PAIRS = 10;