- tor-commits - lists.torproject.org

[tor/master] new ip address for maatuska
by arma＠torproject.org 29 Feb '12

29 Feb '12

commit e21756908f0cc4a475129ee96b1f9eb7ed8d3397 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Feb 29 13:22:41 2012 -0500 new ip address for maatuska --- changes/maatuska-ip | 3 +++ src/or/config.c | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/changes/maatuska-ip b/changes/maatuska-ip new file mode 100644 index 0000000..a00b43f --- /dev/null +++ b/changes/maatuska-ip @@ -0,0 +1,3 @@ + o Directory authority changes: + - Change IP address for maatuska (v3 directory authority). + diff --git a/src/or/config.c b/src/or/config.c index 94a6538..c3e285d 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -820,7 +820,7 @@ add_default_trusted_dir_authorities(authority_type_t type) "208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417", "maatuska orport=80 no-v2 " "v3ident=49015F787433103580E3B66A1707A00E60F2D15B " - "213.115.239.118:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810", + "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810", NULL }; for (i=0; dirservers[i]; i++) {

1 0

[tor/master] Merge branch 'maint-0.2.2'
by arma＠torproject.org 29 Feb '12

29 Feb '12

commit 406bc9527125dccdf68745a07100bd1dc48a9903 Merge: c26aaf9 e217569 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Feb 29 13:23:23 2012 -0500 Merge branch 'maint-0.2.2' changes/maatuska-ip | 3 +++ src/or/config.c | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-)

1 0

[tor/maint-0.2.2] new ip address for maatuska
by arma＠torproject.org 29 Feb '12

29 Feb '12

commit e21756908f0cc4a475129ee96b1f9eb7ed8d3397 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Feb 29 13:22:41 2012 -0500 new ip address for maatuska --- changes/maatuska-ip | 3 +++ src/or/config.c | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/changes/maatuska-ip b/changes/maatuska-ip new file mode 100644 index 0000000..a00b43f --- /dev/null +++ b/changes/maatuska-ip @@ -0,0 +1,3 @@ + o Directory authority changes: + - Change IP address for maatuska (v3 directory authority). + diff --git a/src/or/config.c b/src/or/config.c index 94a6538..c3e285d 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -820,7 +820,7 @@ add_default_trusted_dir_authorities(authority_type_t type) "208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417", "maatuska orport=80 no-v2 " "v3ident=49015F787433103580E3B66A1707A00E60F2D15B " - "213.115.239.118:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810", + "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810", NULL }; for (i=0; dirservers[i]; i++) {

1 0

[tor/master] whitespace fix
by arma＠torproject.org 29 Feb '12

29 Feb '12

commit c26aaf9cba8d40017c30b1921466759382032f33 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Feb 29 13:17:52 2012 -0500 whitespace fix --- src/or/policies.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/policies.c b/src/or/policies.c index e5062cd..5eaebfa 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -669,7 +669,7 @@ compare_unknown_tor_addr_to_addr_policy(uint16_t port, SMARTLIST_FOREACH_BEGIN(policy, addr_policy_t *, tmpe) { if (tmpe->prt_min <= port && port <= tmpe->prt_max) { - if (tmpe->maskbits == 0) { + if (tmpe->maskbits == 0) { /* Definitely matches, since it covers all addresses. */ if (tmpe->policy_type == ADDR_POLICY_ACCEPT) { /* If we already hit a clause that might trigger a 'reject', than we

1 0

[torspec/master] add xxx-pluggable-transports-through-proxy.txt by hellais
by ioerror＠torproject.org 29 Feb '12

29 Feb '12

commit 5b2b6b591ee436b9ff1e65247f4f32fe145c2c78 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Feb 29 13:40:14 2012 -0400 add xxx-pluggable-transports-through-proxy.txt by hellais --- .../xxx-pluggable-transports-through-proxy.txt | 79 ++++++++++++++++++++ 1 files changed, 79 insertions(+), 0 deletions(-) diff --git a/proposals/ideas/xxx-pluggable-transports-through-proxy.txt b/proposals/ideas/xxx-pluggable-transports-through-proxy.txt new file mode 100644 index 0000000..221c0d1 --- /dev/null +++ b/proposals/ideas/xxx-pluggable-transports-through-proxy.txt @@ -0,0 +1,79 @@ +Filename: xxx-pluggable-transports-through-proxy.txt +Title: Pluggable Transport through SOCKS proxy +Author: Arturo Filastò +Created: 28 February 2012 +Status: Draft + +Overview + + Tor introduced Pluggable Transports in proposal 180 Pluggable Transports + for circumvention. + + The problem is that Tor currently cannot use a Pluggable Transport proxy + and a SOCKS proxy at the same time. This has been noticed by users in + #5195, where Tor would be failing saying "Unacceptable option value: + You have configured more than one proxy type". + + +Trivia + + This comes from a discussion that came up with Nick and I promised + to write a proposal for it if I wanted to hear what he had to say. + Nick spoke and I am writing this proposal. + +Acknowledgements + + Most of the credit goes to Nick Mathewson for the main idea and + the rest of it goes to George Kadianakis for helping me out in writing + it. + +Motivation + + After looking at some options we decided to go for this solution solution + since it guarantees backwards compatibility and is not particularly + costly to implement. + +Design overview + + When Tor is configured to use both a Pluggable Transport proxy and SOCKS + proxy it should delegate the proxying to the pluggable transport proxy. + + This can be achieved by setting the environment variables for the SOCKS + proxy to that specified inside of the torrc. + + When the pluggable transport proxy starts it will first read the environment + variables and if it detects that it should be using a SOCKS proxy make + all it's traffic go through it. Once the pluggable transport proxy has successfully + established a connection to the SOCKS proxy it should notify Tor of it's + success or failure. + When both the SOCKS and the PluggableTransport directives are set Tor + should set the environemnt variable start the pluggabletransport proxy and wait + for it to report back on the SOCKS proxy status. If the pluggable transport + reports back a failure or it does not report back at all (maybe because + it is an outdated version), Tor should notify the user of the failure + and exit with an error. + + + The environment variables can also contain the credentials for accessing + the proxy. + +Specifications: Tor Pluggable Transport communication + + When Tor detects a SOCKS proxy directive and a Pluggable Transport + proxy directive it sets the environment variable: + + "TOR_PT_PROXY" -- This is the address of the proxy to be used by + the pluggable transport proxy. It is in the format: + <proxy_type>://<user_name?>:<password?>@<ip>:<port> + ex. socks5://tor:test1234@198.51.100.1:8000 + socks4a://198.51.100.2:8001 + + + If the pluggable transport proxy detects that the TOR_PT_PROXY environment + variable is set it attempts connecting to it. On successs it will + write to stdout (as specified in 180-pluggable-transport.txt) + PROXY true. On failure it should write PROXY-ERROR <errormessage>. + + If Tor does not read any PROXY line or it reads a PROXY-ERROR line + and it is configured to use both SOCKS and PluggableTransport it should + exit with error.

1 0

[arm/master] Prevent crash on startup when reading Feb 29th in logs
by atagar＠torproject.org 29 Feb '12

29 Feb '12

commit a570d9f726473b47d48be4f912a8fa0c7bfd639f Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Feb 29 03:01:21 2012 +0100 Prevent crash on startup when reading Feb 29th in logs During prepopulation of log entries, arm tries to parse the date that Tor gives it. Unfortunately Python is a little (read: very) silly and refuses to accept that February 29th can be a valid day when information about the year is missing. As a solution, we just pretend it is the year 2012 forever when parsing dates from logs (Tor doesn't add the year to its date information). Fixes bug 5265, first reported by an anonymous user from IRC. --- src/cli/logPanel.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/cli/logPanel.py b/src/cli/logPanel.py index 179db9f..496fe86 100644 --- a/src/cli/logPanel.py +++ b/src/cli/logPanel.py @@ -302,8 +302,12 @@ def getLogFileEntries(runlevels, readLimit = None, addLimit = None, config = Non # overwrites missing time parameters with the local time (ignoring wday # and yday since they aren't used) - eventTimeComp = list(time.strptime(timestamp, "%b %d %H:%M:%S")) - eventTimeComp[0] = currentLocalTime.tm_year + # Pretend the year is 2012, because 2012 is a leap year, and parsing a + # date with strptime fails if Feb 29th is passed without a year that's + # actually a leap year. We can't just use the current year, because we + # might be parsing old logs which didn't get rotated. + timestamp = "2012 " + timestamp + eventTimeComp = list(time.strptime(timestamp, "%Y %b %d %H:%M:%S")) eventTimeComp[8] = currentLocalTime.tm_isdst eventTime = time.mktime(eventTimeComp) # converts local to unix time

1 0

[arm/master] Minor tweak to commenting around the leap year bug
by atagar＠torproject.org 29 Feb '12

29 Feb '12

commit f2080aad4e069074c8c7320970b51892def719fc Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Feb 29 07:35:00 2012 -0800 Minor tweak to commenting around the leap year bug Tweak for the preceeding comment and including the ticket with the comment. --- src/cli/logPanel.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/cli/logPanel.py b/src/cli/logPanel.py index 496fe86..dd22558 100644 --- a/src/cli/logPanel.py +++ b/src/cli/logPanel.py @@ -300,12 +300,15 @@ def getLogFileEntries(runlevels, readLimit = None, addLimit = None, config = Non # strips the decimal seconds if "." in timestamp: timestamp = timestamp[:timestamp.find(".")] - # overwrites missing time parameters with the local time (ignoring wday - # and yday since they aren't used) + # Ignoring wday and yday since they aren't used. + # # Pretend the year is 2012, because 2012 is a leap year, and parsing a # date with strptime fails if Feb 29th is passed without a year that's # actually a leap year. We can't just use the current year, because we # might be parsing old logs which didn't get rotated. + # + # https://trac.torproject.org/projects/tor/ticket/5265 + timestamp = "2012 " + timestamp eventTimeComp = list(time.strptime(timestamp, "%Y %b %d %H:%M:%S")) eventTimeComp[8] = currentLocalTime.tm_isdst

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 29 Feb '12

29 Feb '12

commit 2334ad66ac39ef441adc8d98cd78026c34ea242d Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 29 15:15:19 2012 +0000 Update translations for vidalia_help --- el/troubleshooting.po | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/el/troubleshooting.po b/el/troubleshooting.po index 0af8acc..c467709 100644 --- a/el/troubleshooting.po +++ b/el/troubleshooting.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-08-03 15:49-0300\n" -"PO-Revision-Date: 2012-02-29 14:42+0000\n" +"PO-Revision-Date: 2012-02-29 14:50+0000\n" "Last-Translator: isv31 <ix4svs(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -62,7 +62,7 @@ msgstr "Αν αυτό δε βοήθησε, ελέγξτε τη <a href=\"log.htm # type: Content of: <html><body> #: en/troubleshooting.html:43 msgid "<a name=\"connect\"/>" -msgstr "<a name=\"σύνδεση\"/>" +msgstr "<a name=\"connect\"/>" # type: Content of: <html><body><h3> #: en/troubleshooting.html:44 @@ -98,7 +98,7 @@ msgstr "Αν το Tor περιμένει συνδέσεις σε διαφορε # type: Content of: <html><body> #: en/troubleshooting.html:63 msgid "<a name=\"password\"/>" -msgstr "<a name=\"κωδικός\"/>" +msgstr "<a name=\"password\"/>" # type: Content of: <html><body><h3> #: en/troubleshooting.html:64 @@ -156,7 +156,7 @@ msgid "" "Tor for you, you can still fix the problem manually. Simply go into your " "process or task manager, and terminate the Tor process. Then use Vidalia to " "restart Tor and all will work again." -msgstr "" +msgstr "Αν δε βλέπετε το κουμπί Επαναφορά, ή αν το Vidalia δε μπορεί να επανεκκινήσει το Tor, μπορείτε να διορθώσετε το πρόβλημα χειροκίνητα. Ανοίξτε τη λίστα/διαχείρηση διεργασιών και τερματίστε τη διεργασία του Tor. Μετά επανεκκινήστε το Tor με το Vidalia - όλα πρέπει να είναι εντάξει τώρα." # type: Content of: <html><body><ul><li> #: en/troubleshooting.html:106 @@ -182,12 +182,12 @@ msgstr "" # type: Content of: <html><body> #: en/troubleshooting.html:122 msgid "<a name=\"torexited\"/>" -msgstr "" +msgstr "<a name=\"torexited\"/>" # type: Content of: <html><body><h3> #: en/troubleshooting.html:123 msgid "Tor Exited Unexpectedly" -msgstr "" +msgstr "Το Tor σταμάτησε απροσδόκητα" # type: Content of: <html><body> #: en/troubleshooting.html:125 @@ -204,7 +204,7 @@ msgstr "" msgid "" "connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n" "Is Tor already running?\n" -msgstr "" +msgstr "connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \nIs Tor already running?\n" # type: Content of: <html><body> #: en/troubleshooting.html:135 @@ -228,12 +228,12 @@ msgstr "" # type: Content of: <html><body> #: en/troubleshooting.html:147 msgid "<a name=\"stop\"/>" -msgstr "" +msgstr "<a name=\"stop\"/>" # type: Content of: <html><body><h3> #: en/troubleshooting.html:148 msgid "Vidalia Can't Stop Tor" -msgstr "" +msgstr "Το Vidalia δε μπορεί να σταματήσει το Tor" # type: Content of: <html><body> #: en/troubleshooting.html:150 @@ -241,4 +241,4 @@ msgid "" "If Vidalia cannot stop Tor, you should check your <a " "href=\"log.html\">message log</a> to see if Tor reported any errors while " "trying to exit." -msgstr "" +msgstr "Αν το Vidalia δε μπορεί να σταματήσει το Tor, ελέγξτε τα <a href=\"log.html\">μηνύματα συστήματος</a> για να δείτε αν το Tor κατέγραψε λάθη ενώ προσπαθούσε να σταματήσει."

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 29 Feb '12

29 Feb '12

commit dd9c01a273f2990a33da8e72b636f0ad99f9aa21 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 29 14:45:21 2012 +0000 Update translations for vidalia_help --- el/troubleshooting.po | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/el/troubleshooting.po b/el/troubleshooting.po index 15a5cc6..0af8acc 100644 --- a/el/troubleshooting.po +++ b/el/troubleshooting.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-08-03 15:49-0300\n" -"PO-Revision-Date: 2012-02-28 15:05+0000\n" +"PO-Revision-Date: 2012-02-29 14:42+0000\n" "Last-Translator: isv31 <ix4svs(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -41,7 +41,7 @@ msgid "" "is looking for your Tor installation in the wrong directory. You can tell " "Vidalia where Tor is located by updating the Tor Executable option in" " the <a href=\"config.html#general\">general configuration settings</a>." -msgstr "Συνήθως ο λόγος που το Vidalia δε μπορεί να ξεκινήσει το Tor είναι διότι το Vidalia ψάχνει για την εγκατάσταση του Tor σε λανθασμένη τοποθεσία. Μπορείτε να πείτε στο Vidalia πού να βρει το Tor συμπληρώνοντας την επιλογή Tor Executable στις <a href=\"config.html#general\">γενικές ρυθμίσεις</a>." +msgstr "Συνήθως ο λόγος που το Vidalia δε μπορεί να ξεκινήσει το Tor είναι διότι το Vidalia ψάχνει για την εγκατάσταση του Tor σε λανθασμένη τοποθεσία. Μπορείτε να πείτε στο Vidalia πού να βρει το Tor συμπληρώνοντας το πεδίο Tor Executable στις <a href=\"config.html#general\">γενικές ρυθμίσεις</a>." # type: Content of: <html><body> #: en/troubleshooting.html:33 @@ -114,7 +114,7 @@ msgid "" "Vidalia sets a random password for Tor's control port to prevent other " "applications from also connecting to the control port and potentially " "compromising your anonymity." -msgstr "" +msgstr "Το Vidalia δουλεύει με το Tor μέσω της \"θύρας ελέγχου\" του Tor. Η θύρα ελέγχου επιτρέπει στο Vidalia να ενημερώνεται για τη κατάσταση του Tor, να ζητάει νέα ταυτότητα, να ρυθμίζει τις ρυθμίσεις του Tor κτλ. Κάθε φορά που το Vidalia ξεκινάει το Tor, το Vidalia επιλέγει ένα τυχαίο κωδικό για τη θύρα ελέγχου του Tor, ώστε να μην επιτρέπει σε άλλες εφαρμογές να συνδεθούν στη θύρα ελέγχου και να διακινδυνεύσουν την ανωνυμία σας." # type: Content of: <html><body> #: en/troubleshooting.html:75 @@ -122,7 +122,7 @@ msgid "" "Usually this process of generating and setting a random control password " "happens in the background. There are three common situations, though, where " "Vidalia may prompt you for a password:" -msgstr "" +msgstr "Συνήθως αυτή η διαδικασία δημιουργίας και χρήσης ενός τυχαίου κωδικού ελέγχου συμβαίνει στο παρασκήνιο. Υπάρχουν τρεις περιπτώσεις όμως, στις οποίες το Vidalia μπορεί να σας ζητήσει κάποιο κωδικό." # type: Content of: <html><body><ul><li> #: en/troubleshooting.html:82 @@ -131,7 +131,7 @@ msgid "" "happen if you installed the Vidalia bundle and now you're trying to run the " "Tor Browser Bundle. In that case, you'll need to close the old Vidalia and " "Tor before you can run this one." -msgstr "" +msgstr "Τρέχετε ήδη το Vidalia και το Tor. Για παράδειγμα, αυτό μπορεί να συμβεί αν έχετε εγκαταστήσει το πακέτο του Vidalia και τώρα προσπαθείτε να εκτελέσετε το πακέτο Tor Browser. Σε αυτή τη περίπτωση θα πρέπει να τερματίσετε το παλιό Vidalia και το Tor πριν το εκτελέσετε εκ νέου." # type: Content of: <html><body><ul><li> #: en/troubleshooting.html:89 @@ -139,7 +139,7 @@ msgid "" "Vidalia crashed, but left Tor running with the last known random password. " "After you restart Vidalia, it generates a new random password, but Vidalia " "can't talk to Tor, because the random passwords are different." -msgstr "" +msgstr "Το Vidalia κατέρρευσε ή κόλλησε, αλλά άφησε το Tor να τρέχει στο παρασκήνιο με το παλιό τυχαίο κωδικό. Μόλις επανεκκινήσετε το Vidalia δημιουργεί νέο τυχαίο κωδικό, αλλά το Vidalia δε μπορεί να επικοινωνήσει με το Tor επειδή οι δύο κωδικοί είναι διαφορετικοί." # type: Content of: <html><body><ul><li> #: en/troubleshooting.html:94 @@ -147,7 +147,7 @@ msgid "" "If the dialog that prompts you for a control password has a Reset " "button, you can click the button and Vidalia will restart Tor with a new " "random control password." -msgstr "" +msgstr "Αν το παράθυρο διαλόγου που σας ζητάει τον κωδικό ελέγχου έχει ένα κουμπί Επαναφορά, μπορείτε να το πατήσετε και το Vidalia θα επανεκκινήσει το Tor με ένα νέο τυχαίο κωδικό ελέγχου." # type: Content of: <html><body><ul><li> #: en/troubleshooting.html:99

1 0

[tor-cloud/master] We now have images for private bridges
by runa＠torproject.org 29 Feb '12

29 Feb '12

commit 9c3e413e5fa9300898b170afd0a08eda2cd71753 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Wed Feb 29 13:24:03 2012 +0000 We now have images for private bridges --- html/index.html | 40 +++++++++++++++++++++++++++++----------- 1 files changed, 29 insertions(+), 11 deletions(-) diff --git a/html/index.html b/html/index.html index 2e84c35..9cea8a5 100644 --- a/html/index.html +++ b/html/index.html @@ -134,18 +134,29 @@ Console. See How much does it cost? on the <a href="https://cloud.torproject.org/">front page</a> for information about pricing. - + <h3>Normal bridges</h3> <ul class="region-nav"> <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-east-1#launchAmi=ami-302a…" target="_blank">us-east-1 Virginia</a></li> <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-1#launchAmi=ami-85cd…" target="_blank">us-west-1 N. California</a></li> <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-2#launchAmi=ami-4a1f…" target="_blank">us-west-2 Oregon</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=eu-west-1#launchAmi=ami-0123…" target="_blank">eu-west-1 Ireland</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-northeast-1#launchAmi=ami…" target="_blank">ap-northeast-1 Tokyo</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-southeast-1#launchAmi=ami…" target="_blank">ap-southeast-1 Singapore</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-northeast-1#launchAmi=ami…" target="_blank">ap-northeast-1 Tokyo</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-southeast-1#launchAmi=ami…" target="_blank">ap-southeast-1 Singapore</a></li> <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=sa-east-1#launchAmi=ami-c06c…" target="_blank">sa-east-1 Sao Paulo</a></li> - </ul> + </ul> + <h3>Private bridges</h3> + <ul class="region-nav"> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-east-1#launchAmi=ami-ce62…" target="_blank">us-east-1 Virginia</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-1#launchAmi=ami-2bf8…" target="_blank">us-west-1 N. California</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-2#launchAmi=ami-4018…" target="_blank">us-west-2 Oregon</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=eu-west-1#launchAmi=ami-f512…" target="_blank">eu-west-1 Ireland</a></li> + + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-northeast-1#launchAmi=ami…" target="_blank">ap-northeast-1 Tokyo</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-southeast-1#launchAmi=ami…" target="_blank">ap-southeast-1 Singapore</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=sa-east-1#launchAmi=ami-de6a…" target="_blank">sa-east-1 Sao Paulo</a></li> + </ul> + <hgroup> <div class="deco"></div> @@ -262,6 +273,12 @@ <h2>Frequently Asked Questions (FAQ)</h2> </hgroup> + 0. Private bridge or normal bridge? + If you set up a private bridge, your bridge will not tell the bridge + authority that it exists. You will have to manually give out your bridge + address to users. + + 1. How much does it cost? There is no fee charged by the Tor Project, Inc for you to run a Tor Cloud image. Amazon does, however, charge instances @@ -273,10 +290,10 @@ 2. The instance is running, what's next? You should not have to do anything once the instance is up and - running. Tor will start up as a bridge, confirm that it is reachable - from the outside, and then tell the bridge authority that it exists. - After that, the address for your bridge will be given out to - users. + running. Tor will start up as a bridge and confirm that it is reachable + from the outside. If you have set up a normal bridge, then it will also + tell the bridge authority that it exists, and the address for your + bridge will be given out to users. 3. How do I find the address of my bridge? To find the address of your bridge, log on to the AWS Management @@ -327,8 +344,9 @@ href="http://www.atagar.com/arm/">here</a>. 9. What's in the Tor configuration file? - The Tor configuration file that the images have been - configured with can be found <a href="https://cloud.torproject.org/torrc.txt">here</a>. + The Tor configuration file for normal bridges can be found <a + href="https://cloud.torproject.org/torrc.txt">here</a>. The configuration + file for private bridges also contain PublishServerDescriptor 0. 10. Will the images automatically download and install package updates? Yes, the images have all been configured with the <a href="https://help.ubuntu.com/community/AutomaticSecurityUpdates">unattended-upgrades</a> package. This means that your system will automatically download and install updates.

1 0