July 2013 - tor-commits - lists.torproject.org

[translation/tsum] Update translations for tsum
by translation＠torproject.org 11 Jul '13

11 Jul '13

commit 905724817234def6974dd917c6c771e37d7a1c49 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 11 22:45:17 2013 +0000 Update translations for tsum --- hr_HR/short-user-manual_hr_HR_noimg.xhtml | 32 ++++++++++++++--------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/hr_HR/short-user-manual_hr_HR_noimg.xhtml b/hr_HR/short-user-manual_hr_HR_noimg.xhtml index 6eb4dc9..eeb2295 100644 --- a/hr_HR/short-user-manual_hr_HR_noimg.xhtml +++ b/hr_HR/short-user-manual_hr_HR_noimg.xhtml @@ -22,12 +22,12 @@ Napomena: Tor preglednički paketi za Linux i Mac OS X prilično su veliki i nećete moći primiti nijedan od ovih paketa putem Gmail, Hotmail ili Yahoo računa. Ako niste u mogućnosti primiti paket koji želite, pošaljite email na help(a)rt.torproject.org i dat ćemo vam popis zrcalnih web stranica koje možete koristiti. <h3 id="tor-for-smartphones">Tor za pametne telefone</h3> Možete preuzeti Tor na svojem Android uređaju instaliranjem paketa Orbot. Za informacije o tome kako preuzeti i instalirati Orbot, molimo pogledajte <a href="https://www.torproject.org/docs/android.html.en">web stranicu Tor projekta</a>. - We also have experimental packages for <a href="https://www.torproject.org/docs/N900.html.en">Nokia Maemo/N900</a> and <a href="http://sid77.slackware.it/iphone/">Apple iOS</a>. + Imamo i eksperimentalne pakete za <a href="https://www.torproject.org/docs/N900.html.en">Nokia Maemo/N900</a> i <a href="http://sid77.slackware.it/iphone/">Apple iOS</a>. <h3 id="how-to-verify-that-you-have-the-right-version">Kako potvrditi da imate ispravnu inačicu</h3> Prije pokretanja Tor pregledničkog paketa, trebali biste potvrditi da imate ispravnu inačicu. Softver koji ste preuzeli dolazi s datotekom istog imena kao i paket i nastavkom .asc. Ova .asc datoteka je GPG potpis koji će Vam omogućiti da provjerite je li datoteka koju ste preuzeli upravo ona koju smo Vam i namijenili. Da biste mogli provjeriti potpis, morat ćete prvo preuzeti i instalirati GnuPG: - Windows: <a href="http://gpg4win.org/download.html">http://gpg4win.org/download.html</a> Mac OS X: <a href="http://macgpg.sourceforge.net/">http://macgpg.sourceforge.net/</a> Linux: Most Linux distributions come with GnuPG preinstalled. + Windows: <a href="http://gpg4win.org/download.html">http://gpg4win.org/download.html</a> Mac OS X: <a href="http://macgpg.sourceforge.net/">http://macgpg.sourceforge.net/</a> Linux: Većina Linux distribucija dolazi s instaliranim GnuPG-om. Napominjemo da će te možda morati izmjeniti putanje i naredbe korištene niže kako bi proradile na vašem sustavu. Erinn Clark potpisuje Tor Browser Bundle sa ključem 0x63FEE659. Za uvoz Erinninog ključa pokrenite: <pre> @@ -41,13 +41,13 @@ </pre> Trebali biste vidjeti: <pre> - <code>pub 2048R/63FEE659 2003-10-16 - Key fingerprint = 8738 A680 B84B 3031 A630 F2DB 416F 0610 63FE E659 -uid Erinn Clark <erinn(a)torproject.org> -uid Erinn Clark <erinn(a)debian.org> - -uid Erinn Clark <erinn(a)double-helix.org> -sub 2048R/EB399FD7 2003-10-16 + <code>pub 2048R/63FEE659 2003-10-16⏎ +Key fingerprint = 8738 A680 B84B 3031 A630 F2DB 416F 0610 63FE E659⏎ +uid Erinn Clark <erinn(a)torproject.xn--org>-bb3d +uid Erinn Clark <erinn(a)debian.xn--org>-bb3d +⏎ +uid Erinn Clark <erinn(a)double-helix.xn--org>-bb3d +sub 2048R/EB399FD7 2003-10-16⏎ </code> </pre> Da biste verificirali potpis paketa kojeg ste preuzeli, pokrenite sljedeću naredbu: @@ -58,7 +58,7 @@ sub 2048R/EB399FD7 2003-10-16 Ispis bi trebao glasiti "Good signature". Neispravan potpis znači da je datoteka možda neovlašteno izmijenjena. Ako vidite neispravan potpis, pošaljite nam detalje o tome odakle ste preuzeli paket, kako ste provjerili potpis, te ispis GnuPG-a e-poštom na help(a)rt.torproject.org. Nakon što ste provjerili potpis i dobili ispis"Good signature", nastavite i otpakirajte arhivu paketa. Zatim biste trebali vidjeti mapu imena sličnog tor-browser_hr-HR. U toj mapi nalazi se mapa imena Docs, koja sadrži datoteku changelog. Provjerite odgovara li broj inačice na prvoj liniji changelog datoteke broju inačice u nazivu datoteke. <h3 id="how-to-use-the-tor-browser-bundle">Kako koristiti Tor preglednički paket</h3> - After downloading the Tor Browser Bundle and extracting the package, you should have a directory with a few files in it. One of the files is an executable called "Start Tor Browser" (or "start-tor-browser", depending on your operating system). + Nakon preuzimanja Tor pregledničkog paketa i otpakiravanja arhive, trebali biste imati mapu koja sadrži nekoliko datoteka. Jedna od datoteka je izvršna datoteka imena "Start Tor Browser" (ili "start-tor-browser", ovisno o vašem operacijskom sustavu). Kada pokrenete Tor preglednički paket, prvo ćete vidjeti kako se Vidalia pokreće i spaja na Tor mrežu. Nakon toga, preglednik će potvrditi da koristite Tor prikazivanjem <a href="https://check.torproject.org/">https://check.torproject.org/</a>. Sada možete pretraživati Internet kroz Tor. Napominjemo kako je važno da koristite preglednik koji dolazi s paketom, a ne svoj vlastiti preglednik. @@ -121,12 +121,12 @@ sub 2048R/EB399FD7 2003-10-16 Za više informacija, pogledajte <a href="https://torproject.org/docs/faq.html#VidaliaPassword">Često postavljena pitanja</a> na web stranici Tor projekta. <h3 id="flash-does-not-work">Flash ne radi</h3> Zbog sigurnosnih razloga, Flash, Java i drugi priključci su trenutno onemogućeni za Tor. Priključci djeluju neovisno od Firefoxa i mogu na Vašem računalu izvršavati aktivnosti koje uništavaju Vašu anonimnost. - Most YouTube videos work with HTML5, and it is possible to view these videos over Tor. You need to join the <a href="https://www.youtube.com/html5">HTML5 trial</a> on the YouTube website before you can use the HTML5 player. + Većina YouTube videozapisa radi s HTML5 standardom i moguće je gledati te videozapise kroz Tor. Morate se prijaviti za <a href="https://www.youtube.com/html5">HTML5 trial</a> na YouTubeu da biste mogli koristiti HTML5 reproduktor. Napominjemo da pretražnik neće zapamtiti da ste se prijavili za testiranje nakon što ga zatvorite, pa ćete morati ponovno se prijaviti sljedeći puta kada pokrenete Tor Browser Bundle. - Please see the <a href="https://www.torproject.org/torbutton/torbutton-faq.html#noflash">Torbutton FAQ</a> for more information. - <h3 id="i-want-to-use-another-browser">I want to use another browser</h3> - For security reasons, we recommend that you only browse the web through Tor using the Tor Browser Bundle. It is technically possible to use Tor with other browsers, but by doing so you open yourself up to potential attacks. - <h3 id="why-tor-is-slow">Why Tor is slow</h3> - Tor can sometimes be a bit slower than your normal Internet connection. After all, your traffic is sent through many different countries, sometimes across oceans around the world! + Molimo pogledajte <a href="https://www.torproject.org/torbutton/torbutton-faq.html#noflash">Torbutton FAQ</a> za više informacija. + <h3 id="i-want-to-use-another-browser">Želim koristiti drugi preglednik</h3> + Zbog sigurnosnih razloga, preporučujemo da pretražujete web kroz Tor korištenjem Tor pregledničkog paketa. Tehnički je moguće koristiti Tor s drugim preglednicima, ali se na taj način izlažete potencijalnim napadima. + <h3 id="why-tor-is-slow">Zašto je Tor spor</h3> + Tor nekad može biti nešto sporiji od Vaše uobičajene internetske veze. Uostalom, Vaš promet se šalje kroz mnogo različitih zemalja, ponekad i preko oceana diljem svijeta! </body> </html>

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 11 Jul '13

11 Jul '13

commit c9cfedba82ca47f8321752a4704349219b65e1cd Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 11 22:15:18 2013 +0000 Update translations for tsum --- hr_HR/short-user-manual_hr_HR_noimg.xhtml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hr_HR/short-user-manual_hr_HR_noimg.xhtml b/hr_HR/short-user-manual_hr_HR_noimg.xhtml index dd871e6..6eb4dc9 100644 --- a/hr_HR/short-user-manual_hr_HR_noimg.xhtml +++ b/hr_HR/short-user-manual_hr_HR_noimg.xhtml @@ -115,12 +115,12 @@ sub 2048R/EB399FD7 2003-10-16 <li>Isključite opciju Sakrij proširenja za poznate vrste datoteka i kliknite na OK</li> </ol> <h3 id="vidalia-asks-for-a-password">Vidalia traži lozinku</h3> - You should not have to enter a password when starting Vidalia. If you are prompted for one, you are likely affected by one of these problems: - You are already running Vidalia and Tor: For example, this situation can happen if you installed the Vidalia bundle and now you're trying to run the Tor Browser Bundle. In that case, you will need to close the old Vidalia and Tor before you can run this one. - Vidalia crashed, but left Tor running: 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. If you do not see a Reset button, or if Vidalia is unable to restart Tor for you; go into your process or task manager, and terminate the Tor process. Then use Vidalia to restart Tor. - For more information, see the <a href="https://torproject.org/docs/faq.html#VidaliaPassword">FAQ</a> on the Tor Project website. - <h3 id="flash-does-not-work">Flash does not work</h3> - For security reasons, Flash, Java, and other plugins are currently disabled for Tor. Plugins operate independently from Firefox and can perform activity on your computer that ruins your anonymity. + Vidalia Vas pri pokretanju ne bi trebala tražiti lozinku. Ako je zatražena lozinka, vjerojatno se pojavio jedan od sljedećih problema: + Vidalia i Tor su već pokrenuti: Ova se situacija, na primjer, može dogoditi ako ste instalirali Vidalia paket i sad pokušavate pokrenuti Tor preglednički paket. U tom slučaju, morat ćete zatvoriti staru Vidaliju i Tor prije nego što možete pokrenuti ovaj paket. + Vidalia se srušila, ali je Tor nastavio raditi: Ako prozor koji Vas traži upravljačku lozinku ima gumb Reset, možete kliknuti na taj gumb i Vidalia će ponovno pokrenuti Tor s novom nasumičnom upravljačkom lozinkom. Ako ne vidite gumb Reset, ili ako Vidalia ne može ponovno pokrenuti Tor, otvorite svoj upravitelj procesa ili zadataka i prekinite Tor proces. Zatim upotrijebite Vidaliju da biste ponovno pokrenuli Tor. + Za više informacija, pogledajte <a href="https://torproject.org/docs/faq.html#VidaliaPassword">Često postavljena pitanja</a> na web stranici Tor projekta. + <h3 id="flash-does-not-work">Flash ne radi</h3> + Zbog sigurnosnih razloga, Flash, Java i drugi priključci su trenutno onemogućeni za Tor. Priključci djeluju neovisno od Firefoxa i mogu na Vašem računalu izvršavati aktivnosti koje uništavaju Vašu anonimnost. Most YouTube videos work with HTML5, and it is possible to view these videos over Tor. You need to join the <a href="https://www.youtube.com/html5">HTML5 trial</a> on the YouTube website before you can use the HTML5 player. Napominjemo da pretražnik neće zapamtiti da ste se prijavili za testiranje nakon što ga zatvorite, pa ćete morati ponovno se prijaviti sljedeći puta kada pokrenete Tor Browser Bundle. Please see the <a href="https://www.torproject.org/torbutton/torbutton-faq.html#noflash">Torbutton FAQ</a> for more information.

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 11 Jul '13

11 Jul '13

commit edf8500819f04cc154370b4685db9ac4f7cea9ae Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 11 21:45:18 2013 +0000 Update translations for tsum --- hr_HR/short-user-manual_hr_HR_noimg.xhtml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/hr_HR/short-user-manual_hr_HR_noimg.xhtml b/hr_HR/short-user-manual_hr_HR_noimg.xhtml index 085a21b..dd871e6 100644 --- a/hr_HR/short-user-manual_hr_HR_noimg.xhtml +++ b/hr_HR/short-user-manual_hr_HR_noimg.xhtml @@ -96,25 +96,25 @@ sub 2048R/EB399FD7 2003-10-16 <h4 id="windows-xp">Windows XP</h4> <ol style="list-style-type: decimal"> <li>Otvorite Moje računalo</li> - <li>Click on Tools and choose Folder Options... in the menu</li> - <li>Click on the View tab</li> - <li>Uncheck Hide extensions for known file types and click OK</li> + <li>Kliknite na Alati i odaberite Odrednice mape... u izborniku</li> + <li>Kliknite na karticu Prikaz</li> + <li>Isključite opciju Sakrij proširenja za poznate vrste datoteka i kliknite na OK</li> </ol> <h4 id="windows-vista">Windows Vista</h4> <ol style="list-style-type: decimal"> - <li>Open Computer</li> - <li>Click on Organize and choose Folder and search options in the menu</li> - <li>Click on the View tab</li> - <li>Uncheck Hide extensions for known file types and click OK</li> + <li>Otvorite Računalo</li> + <li>Kliknite na Organiziraj i odaberite Mogućnosti mape i pretraživanja u izborniku</li> + <li>Kliknite na karticu Prikaz</li> + <li>Isključite opciju Sakrij proširenja za poznate vrste datoteka i kliknite na OK</li> </ol> <h4 id="windows-7">Windows 7</h4> <ol style="list-style-type: decimal"> - <li>Open Computer</li> - <li>Click on Organize and choose Folder and search options in the menu</li> - <li>Click on the View tab</li> - <li>Uncheck Hide extensions for known file types and click OK</li> + <li>Otvorite Računalo</li> + <li>Kliknite na Organiziraj i odaberite Mogućnosti mape i pretraživanja u izborniku</li> + <li>Kliknite na karticu Prikaz</li> + <li>Isključite opciju Sakrij proširenja za poznate vrste datoteka i kliknite na OK</li> </ol> - <h3 id="vidalia-asks-for-a-password">Vidalia asks for a password</h3> + <h3 id="vidalia-asks-for-a-password">Vidalia traži lozinku</h3> You should not have to enter a password when starting Vidalia. If you are prompted for one, you are likely affected by one of these problems: You are already running Vidalia and Tor: For example, this situation can happen if you installed the Vidalia bundle and now you're trying to run the Tor Browser Bundle. In that case, you will need to close the old Vidalia and Tor before you can run this one. Vidalia crashed, but left Tor running: 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. If you do not see a Reset button, or if Vidalia is unable to restart Tor for you; go into your process or task manager, and terminate the Tor process. Then use Vidalia to restart Tor.

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 11 Jul '13

11 Jul '13

commit fa861156c2df794d6346236ce90ea2e5b0d3e82c Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 11 21:15:17 2013 +0000 Update translations for tsum --- hr_HR/short-user-manual_hr_HR_noimg.xhtml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/hr_HR/short-user-manual_hr_HR_noimg.xhtml b/hr_HR/short-user-manual_hr_HR_noimg.xhtml index efd975c..085a21b 100644 --- a/hr_HR/short-user-manual_hr_HR_noimg.xhtml +++ b/hr_HR/short-user-manual_hr_HR_noimg.xhtml @@ -84,18 +84,18 @@ sub 2048R/EB399FD7 2003-10-16 <li>Kliknite na Mreža. Odaberite Koristim proxy za pristup Internetu.</li> <li>Na liniji Adresa upišite adresu otvorenog proxyja. Možete upisati hostname ili IP adresu.</li> <li>Unesite port za proxy.</li> - <li>Generally, you do not need a username and password. If you do, enter the information in the proper fields.</li> - <li>Choose the Type of proxy you are using, whether HTTP/HTTPS, SOCKS4, or SOCKS5.</li> - <li>Push the OK button. Vidalia and Tor are now configured to use a proxy to access the rest of the Tor network.</li> + <li>Obično Vam ne treba korisničko ime i lozinka. Ako trebate, unesite ih u odgovarajuća polja.</li> + <li>Odaberite Tip proxyja koji koristite: HTTP/HTTPS, SOCKS4, ili SOCKS5.</li> + <li>Kliknite gumb OK. Vidalia i Tor su sada podešeni za korištenje proxyja za spajanje na Tor mrežu.</li> </ol> - <h2 id="frequently-asked-questions">Frequently Asked Questions</h2> - This section will answer some of the most common questions. If your question is not mentioned here, please send an email to help(a)rt.torproject.org. - <h3 id="unable-to-extract-the-archive">Unable to extract the archive</h3> - If you are using Windows and find that you cannot extract the archive, download and install <a href="http://www.7-zip.org/">7-Zip</a>. + <h2 id="frequently-asked-questions">Često postavljena pitanja</h2> + Ovaj odjeljak će dati odgovore na neka najčešće postavljena pitanja. Ako Vaše pitanje nije odgovoreno ovdje, molimo pošaljite email na help(a)rt.torproject.org. + <h3 id="unable-to-extract-the-archive">Nije bilo moguće otpakirati arhivu</h3> + Ako koristite Windowse i otkrijete da ne možete otpakirati arhivu, preuzmite i instalirajte <a href="http://www.7-zip.org/">7-Zip</a>. Ako niste u mogućnosti preuzeti 7-Zip, pokušajte preimenovati datoteku iz .z u .zip i upotrijebite winzip za otpakiravanje arhive. Prije preimenovanja datoteke, podesite Windowse kako bi vam prikazivali nastavke datoteka: <h4 id="windows-xp">Windows XP</h4> <ol style="list-style-type: decimal"> - <li>Open My Computer</li> + <li>Otvorite Moje računalo</li> <li>Click on Tools and choose Folder Options... in the menu</li> <li>Click on the View tab</li> <li>Uncheck Hide extensions for known file types and click OK</li>

1 0

[tor/master] Remove a bogus semicolon spotted by Gisle Vanem
by nickm＠torproject.org 11 Jul '13

11 Jul '13

commit 14d5e7f85e343a48e27c3b8f2b560c4d1aff5315 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 11 15:53:35 2013 -0400 Remove a bogus semicolon spotted by Gisle Vanem --- src/or/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/config.h b/src/or/config.h index 0250f64..8c8167f 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -109,7 +109,7 @@ typedef struct bridge_line_t { char *transport_name; /* The name of the pluggable transport that should be used to connect to the bridge. */ char digest[DIGEST_LEN]; /* The bridge's identity key digest. */ - smartlist_t *socks_args;; /* SOCKS arguments for the pluggable + smartlist_t *socks_args; /* SOCKS arguments for the pluggable transport proxy. */ } bridge_line_t;

1 0

r26252: {website} start adding contact info ala #9193 (website/trunk/about/en)
by Andrew Lewman 11 Jul '13

11 Jul '13

Author: phobos Date: 2013-07-11 15:56:13 +0000 (Thu, 11 Jul 2013) New Revision: 26252 Modified: website/trunk/about/en/corepeople.wml Log: start adding contact info ala #9193 Modified: website/trunk/about/en/corepeople.wml =================================================================== --- website/trunk/about/en/corepeople.wml 2013-07-10 19:11:19 UTC (rev 26251) +++ website/trunk/about/en/corepeople.wml 2013-07-11 15:56:13 UTC (rev 26252) @@ -110,7 +110,7 @@ <a href="<page press/press>">press contact</a></dt> <dd>Manages the business operations of The Tor Project, Inc. Plays roles of finance, advocacy, project management, strategy, - press, and general support.</dd> + press, and general support. He can be contacted via OpenPGP 0x6B4D6475 or 508-801-0746.</dd> <dt>Dr. Karsten Loesing, Metrics Researcher and Developer, Project Manager</dt> <dd>Primary researcher and developer into

1 0

[bridgedb/master] More bridge pool assignment debug output
by asn＠torproject.org 11 Jul '13

11 Jul '13

commit 0bc21e19779e1e139aebf814fa067c581ff1e1ad Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Wed Jul 10 19:30:20 2013 +0000 More bridge pool assignment debug output Also more readable descriptor parser debug logging --- lib/bridgedb/Bridges.py | 37 +++++++++++++++++++++---------------- lib/bridgedb/Main.py | 3 +++ 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index 7dab6d9..cf46b3b 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -504,16 +504,16 @@ def parseExtraInfoFile(f): logging.debug("Parsing extra-info line") line = line[11:] (nickname, ID) = line.split() - logging.debug("Parsed Nickname: %s", nickname) + logging.debug(" Parsed Nickname: %s", nickname) if is_valid_fingerprint(ID): - logging.debug("Parsed fingerprint: %s", ID) + logging.debug(" Parsed fingerprint: %s", ID) ID = fromHex(ID) else: - logging.debug("Parsed invalid fingerprint: %s", ID) + logging.debug(" Parsed invalid fingerprint: %s", ID) # get the transport line if ID and line.startswith("transport "): - logging.debug("Parsing transport line") + logging.debug(" Parsing transport line") fields = line[10:].split() # [ arglist ] field, optional if len(fields) >= 3: @@ -524,7 +524,7 @@ def parseExtraInfoFile(f): try: k,v = arg.split('=') except ValueError: continue argdict[k] = v - logging.debug("Parsing Argument: %s: %s", k, v) + logging.debug(" Parsing Argument: %s: %s", k, v) # get the required fields, method name and address if len(fields) >= 2: @@ -536,8 +536,8 @@ def parseExtraInfoFile(f): m = regex.match(fields[1]) address = ipaddr.IPAddress(m.group(1)) port = int(m.group(2)) - logging.debug("Parsed Transport: %s", method_name) - logging.debug("Parsed Transport Address: %s:%d", address, port) + logging.debug(" Parsed Transport: %s", method_name) + logging.debug(" Parsed Transport Address: %s:%d", address, port) yield ID, method_name, address, port, argdict except (IndexError, ValueError, AttributeError): # skip this line @@ -553,6 +553,8 @@ def parseStatusFile(f): num_or_address_lines = 0 or_addresses = {} for line in f: + if not ID: + logging.debug("Parsing network status line") line = line.strip() if line.startswith("opt "): line = line[4:] @@ -563,37 +565,38 @@ def parseStatusFile(f): timestamp = time.mktime(time.strptime( " ".join(line.split()[4:6]), "%Y-%m-%d %H:%M:%S") ) - logging.debug("Timestamp: %s", timestamp) + logging.debug(" Fingerprint: %s", toHex(ID)) + logging.debug(" Timestamp: %s", timestamp) except binascii.Error: - logging.warn("Unparseable base64 ID %r", line.split()[2]) + logging.warn(" Unparseable base64 ID %r", line.split()[2]) except ValueError: timestamp = None - logging.debug("Timestamp; Invalid") + logging.debug(" Timestamp; Invalid") elif ID and line.startswith("a "): if num_or_address_lines < 8: line = line[2:] try: address,portlist = parseORAddressLine(line) - logging.debug("Parsed address: %s", address) - logging.debug("Parsed port(s): %s", portlist) + logging.debug(" Parsed address: %s", address) + logging.debug(" Parsed port(s): %s", portlist) except ParseORAddressError: - logging.debug("Failed to Parsed address: %s", address) + logging.debug(" Failed to Parsed address: %s", address) try: or_addresses[address].add(portlist) except KeyError: or_addresses[address] = portlist else: - logging.warn("Skipping extra or-address line "\ + logging.warn(" Skipping extra or-address line "\ "from Bridge with ID %r" % ID) num_or_address_lines += 1 elif ID and timestamp and line.startswith("s "): flags = line.split() - logging.debug("Parsed Flags: %s", flags) + logging.debug(" Parsed Flags: %s", flags) yield ID, ("Running" in flags), ("Stable" in flags), or_addresses, timestamp timestamp = ID = None - logging.debug("Total: %d OR address lines", num_or_address_lines) + logging.debug(" Total: %d OR address lines", num_or_address_lines) num_or_address_lines = 0 or_addresses = {} @@ -1026,6 +1029,8 @@ class FilteredBridgeSplitter(BridgeHolder): desc.append(g.description) # add transports + logging.debug("%s supports %d transports" % (toHex(b.getID()), + len(b.transports))) for transport in b.transports: desc.append("transport=%s"%(transport.methodname)) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 621fcb9..f5ebc4e 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -232,8 +232,10 @@ def load(cfg, splitter, clear=False): for transport in Bridges.parseExtraInfoFile(f): ID, method_name, address, port, argdict = transport if bridges[ID].running: + logging.debug(" Appending transport to running bridge") bridges[ID].transports.append(Bridges.PluggableTransport(bridges[ID], method_name, address, port, argdict)) + assert bridges[ID].transports, "We added a transport but it disappeared!" logging.debug("Closing extra-info document") f.close() if hasattr(cfg, "COUNTRY_BLOCK_FILE"): @@ -417,6 +419,7 @@ def startup(cfg): # Dump bridge pool assignments to disk. try: + logging.debug("Dumping pool assignments file") f = open(cfg.ASSIGNMENTS_FILE, 'a') f.write("bridge-pool-assignment %s\n" % time.strftime("%Y-%m-%d %H:%M:%S"))

1 0

[bridgedb/master] HMAC isn't a logger, don't pass it args as if it is
by asn＠torproject.org 11 Jul '13

11 Jul '13

commit 78ba1628bdc405d0f6b5698b78e2b682d43928d1 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu Jul 11 10:57:43 2013 +0000 HMAC isn't a logger, don't pass it args as if it is Bug fix on #9237. Bug introduced in c0ee0d54 --- lib/bridgedb/Dist.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index 8ca8a73..aebb1f8 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -157,7 +157,7 @@ class IPBasedDistributor(bridgedb.Bridges.BridgeHolder): n) bridgeFilterRules.append(g) logging.info("category<%s>%s", epoch, Util.logSafely(area)) - pos = self.areaOrderHmac("category<%s>%s", epoch, area) + pos = self.areaOrderHmac("category<%s>%s" % (epoch, area)) key1 = bridgedb.Bridges.get_hmac(self.splitter.key, "Order-Bridges-In-Ring-%d"%n) break;

1 0

r26251: {website} update contact info (website/trunk/about/en)
by Andrew Lewman 10 Jul '13

10 Jul '13

Author: phobos Date: 2013-07-10 19:11:19 +0000 (Wed, 10 Jul 2013) New Revision: 26251 Modified: website/trunk/about/en/contact.wml Log: update contact info Modified: website/trunk/about/en/contact.wml =================================================================== --- website/trunk/about/en/contact.wml 2013-07-10 00:20:44 UTC (rev 26250) +++ website/trunk/about/en/contact.wml 2013-07-10 19:11:19 UTC (rev 26251) @@ -95,11 +95,13 @@ <a id="phone"></a> <h3><a class="anchor" href="#phone">Telephone</a></h3> - If none of the above appeal to you, calling +1-781-948-1982 - will reach the Tor office. Should there be no answer, please leave - a message with a way to reach you. Please be aware that your phone - company and ours (and everyone in between) could listen to the - call. Please email help(a)rt.torproject.org for support. + If none of the above appeal to you, calling +1-508-801-0746 + will reach the Tor office. Should there be no answer, please + leave a message with a way to reach you. Please be aware that your + phone company and ours (and everyone in between) could listen to + the call. Please do not call for technical support, rather email + help(a)rt.torproject.org. Technical support calls are not + returned. </div>

1 0

[tor-browser-bundle/master] fetch-inputs: implement proper gpg checking and partial script cleanup
by mikeperry＠torproject.org 10 Jul '13

10 Jul '13

commit 1913aee57276738ad65bfc34d3177f375b8e0d90 Author: Peter Palfrader <peter(a)palfrader.org> Date: Wed Jul 10 18:56:59 2013 +0200 fetch-inputs: implement proper gpg checking and partial script cleanup --- gitian/fetch-inputs.sh | 269 +++++++++++++++++++++++------------------------- gitian/gpg/OPENSSL.gpg | Bin 0 -> 4316 bytes 2 files changed, 126 insertions(+), 143 deletions(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 21728e5..cd8b4cd 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -3,90 +3,143 @@ # fetch-inputs.sh - Fetch our inputs from the source mirror # -. ./versions - +MIRROR_URL=https://people.torproject.org/~mikeperry/mirrors/sources/ +set -e +set -u umask 0022 -export WRAPPER_DIR=$PWD +if ! [ -e ./versions ]; then + echo >&2 "Error: ./versions file does not exist" + exit 1 +fi + +. ./versions + +WRAPPER_DIR=$(dirname "$0") +WRAPPER_DIR=$(readlink -f "$WRAPPER_DIR") -if [ -z "$1" ]; then - INPUTS_DIR=$PWD/../../gitian-builder/inputs +if [ "$#" -gt 1 ]; then + echo >&2 "Usage: $0 [<inputsdir>]" + exit 1 +elif [ "$#" = 1 ]; then + INPUTS_DIR="$1" else - INPUTS_DIR=$1 + INPUTS_DIR="$PWD/../../gitian-builder/inputs" fi -if [ -n $INPUTS_DIR -a ! -d $INPUTS_DIR ]; -then - mkdir $INPUTS_DIR -fi +mkdir -p "$INPUTS_DIR" +cd "$INPUTS_DIR" -if [ -n $INPUTS_DIR -a -d $INPUTS_DIR ]; then - cd $INPUTS_DIR -fi -MIRROR_URL=https://people.torproject.org/~mikeperry/mirrors/sources/ +############################################################################## +CLEANUP=$(tempfile) +trap "bash '$CLEANUP'; rm -f '$CLEANUP'" EXIT -gpg --import $WRAPPER_DIR/gpg/* +verify() { + local file="$1"; shift + local keyring="$1"; shift -# Get package files from mirror -for i in OPENSSL TOOLCHAIN4 OSXSDK # OBFSPROXY -do - PACKAGE=${i}"_PACKAGE" - URL=${MIRROR_URL}${!PACKAGE} - wget -N ${URL} #>& /dev/null - if [ $? -ne 0 ]; then - echo "$i url ${URL} is broken!" - mv ${!PACKAGE} ${!PACKAGE}".removed" + local f + for f in "$file" "$file.asc" "$keyring"; do + if ! [ -e "$f" ]; then + echo >&2 "Error: Required file $f does not exist."; exit 1 + fi + done + + local tmpfile=$(tempfile) + echo "rm -f '$tmpfile'" >> "$CLEANUP" + local gpghome=$(mktemp -d) + echo "rm -rf '$gpghome'" >> "$CLEANUP" + exec 3> "$tmpfile" + + GNUPGHOME="$gpghome" gpg --no-options --no-default-keyring --trust-model=always --keyring="$keyring" --status-fd=3 --verify "$file.asc" "$file" >/dev/null 2>&1 + if grep -q '^\[GNUPG:\] GOODSIG ' "$tmpfile"; then + return 0 + else + return 1 + fi +} + +get() { + local file="$1"; shift + local url="$1"; shift + + if ! wget -N "$url" >& /dev/null; then + echo >&2 "Error: Cannot download $url" + mv "${file}" "${file}.DLFAILED" exit 1 fi -done +} + +update_git() { + local dir="$1"; shift + local url="$1"; shift + local tag="${1:-}" + + if [ -d "$dir/.git" ]; + then + (cd "$dir" && git fetch origin && git fetch --tags origin) + else + if ! git clone "$url"; then + echo >&2 "Error: Cloning $url failed" + exit 1 + fi + fi + + if [ -n "$tag" ]; then + (cd "$dir" && git checkout "$tag") + fi +} + +############################################################################## +# Get package files from mirror # Get+verify sigs that exist -# XXX: This doesn't cover everything. See #8525 for i in OPENSSL # OBFSPROXY do - PACKAGE=${i}"_PACKAGE" - URL=${MIRROR_URL}${!PACKAGE} - if [ ! -f ${!PACKAGE}".asc" ]; then - wget -N ${URL}".asc" >& /dev/null - if [ $? -ne 0 ]; then - echo "$i GPG sig url ${URL} is broken!" - mv ${!PACKAGE} ${!PACKAGE}".nogpg" - exit 1 - fi - fi - gpg ${!PACKAGE}".asc" >& /dev/null - if [ $? -ne 0 ]; then - echo "$i GPG signature is broken for ${URL}" - mv ${!PACKAGE} ${!PACKAGE}".badgpg" + PACKAGE="${i}_PACKAGE" + URL="${MIRROR_URL}${!PACKAGE}" + get "${!PACKAGE}" "$URL" + get "${!PACKAGE}.asc" "$URL.asc" + + if ! verify "${!PACKAGE}" "$WRAPPER_DIR/gpg/$i.gpg"; then + echo "$i: GPG signature is broken for ${URL}" + mv "${!PACKAGE}" "${!PACKAGE}.badgpg" exit 1 fi done +# XXX: This doesn't cover everything. See #8525 +for i in TOOLCHAIN4 OSXSDK +do + PACKAGE="${i}_PACKAGE" + URL="${MIRROR_URL}${!PACKAGE}" + get "${!PACKAGE}" "${MIRROR_URL}${!PACKAGE}" + echo >&2 "Warning, not verifying signature for $i" +done + # Verify packages with weak or no signatures via multipath downloads # (OpenSSL is signed with MD5, and OSXSDK is not signed at all) mkdir -p verify cd verify for i in OPENSSL OSXSDK do - URL=${i}"_URL" - PACKAGE=${i}"_PACKAGE" - wget -N --no-remove-listing ${!URL} >& /dev/null - if [ $? -ne 0 ]; then + URL="${i}_URL" + PACKAGE="${i}_PACKAGE" + if ! wget -N --no-remove-listing "${!URL}"; then echo "$i url ${!URL} is broken!" - mv ${!PACKAGE} ${!PACKAGE}".removed" + mv "${!PACKAGE}" "${!PACKAGE}.removed" exit 1 fi done # XXX: Google won't allow wget -N.. We need to re-download the whole # TOOLCHAIN4 each time :/ -rm -f $TOOLCHAIN4_PACKAGE -wget $TOOLCHAIN4_URL +rm -f "$TOOLCHAIN4_PACKAGE" +wget "$TOOLCHAIN4_URL" for i in OPENSSL OSXSDK TOOLCHAIN4 do - PACKAGE=${i}"_PACKAGE" - diff ${!PACKAGE} ../${!PACKAGE} - if [ $? -ne 0 ]; then + PACKAGE="${i}_PACKAGE" + if ! diff "${!PACKAGE}" "../${!PACKAGE}"; then echo "Package ${!PACKAGE} differs from our mirror's version!" exit 1 fi @@ -102,7 +155,7 @@ if [ ! -f mingw-w64-svn-snapshot-r5830.zip ]; then svn co -r 5830 https://mingw-w64.svn.sourceforge.net/svnroot/mingw-w64/trunk mingw-w64-svn || exit 1 # XXX: Path - ZIPOPTS="-x*/.svn/*" $WRAPPER_DIR/build-helpers/dzip.sh mingw-w64-svn-snapshot-r5830.zip mingw-w64-svn + ZIPOPTS="-x*/.svn/*" "$WRAPPER_DIR/build-helpers/dzip.sh" mingw-w64-svn-snapshot-r5830.zip mingw-w64-svn fi mkdir -p linux-langpacks @@ -112,25 +165,26 @@ mkdir -p mac-langpacks for i in $BUNDLE_LOCALES do cd linux-langpacks - wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$FIREFOX_LANG_VER/… + wget -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$FIREFOX_LANG_VER/…" cd .. cd win32-langpacks - wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$FIREFOX_LANG_VER/… + wget -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$FIREFOX_LANG_VER/…" cd .. cd mac-langpacks - wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$FIREFOX_LANG_VER/… + wget -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$FIREFOX_LANG_VER/…" cd .. done -$WRAPPER_DIR/build-helpers/dzip.sh win32-langpacks.zip win32-langpacks -$WRAPPER_DIR/build-helpers/dzip.sh linux-langpacks.zip linux-langpacks -$WRAPPER_DIR/build-helpers/dzip.sh mac-langpacks.zip mac-langpacks +"$WRAPPER_DIR/build-helpers/dzip.sh" win32-langpacks.zip win32-langpacks +"$WRAPPER_DIR/build-helpers/dzip.sh" linux-langpacks.zip linux-langpacks +"$WRAPPER_DIR/build-helpers/dzip.sh" mac-langpacks.zip mac-langpacks -ln -sf $NOSCRIPT_PACKAGE noscript(a)noscript.net.xpi -ln -sf $PDFJS_PACKAGE uriloader(a)pdf.js.xpi -ln -sf $OPENSSL_PACKAGE openssl.tar.gz +ln -sf "$NOSCRIPT_PACKAGE" noscript(a)noscript.net.xpi +ln -sf "$PDFJS_PACKAGE" uriloader(a)pdf.js.xpi +ln -sf "$OPENSSL_PACKAGE" openssl.tar.gz # Fetch latest gitian-builder itself +# XXX - this is broken if a non-standard inputs dir is selected using the command line flag. cd .. git remote set-url origin https://git.torproject.org/builders/gitian-builder.git git fetch origin @@ -138,89 +192,18 @@ git fetch --tags origin git checkout tor-browser-builder-2 cd inputs -if [ -d tbb-windows-installer/.git ]; -then - cd tbb-windows-installer - git fetch origin - git fetch --tags origin - cd .. -else - git clone https://github.com/moba/tbb-windows-installer.git || exit 1 -fi - -if [ -d zlib/.git ]; -then - cd zlib - git fetch origin - git fetch --tags origin - cd .. -else - git clone https://github.com/madler/zlib.git || exit 1 -fi - -if [ -d libevent/.git ]; -then - cd libevent - git fetch origin - git fetch --tags origin - cd .. -else - git clone https://github.com/libevent/libevent.git || exit 1 -fi - -if [ -d tor-launcher/.git ]; -then - cd tor-launcher - git fetch origin - git fetch --tags origin - cd .. -else - git clone https://git.torproject.org/tor-launcher.git || exit 1 -fi - -if [ -d tor/.git ]; -then - cd tor - git fetch origin - git fetch --tags origin - cd .. -else - git clone https://git.torproject.org/tor.git || exit 1 -fi - -if [ -d torbutton/.git ]; -then - cd torbutton - git fetch origin - git fetch --tags origin - cd .. -else - git clone https://git.torproject.org/torbutton.git || exit 1 -fi - -if [ -d https-everywhere/.git ]; -then - cd https-everywhere - git fetch origin - git fetch --tags origin - cd .. -else - git clone https://git.torproject.org/https-everywhere.git || exit 1 -fi - -if [ -d tor-browser/.git ]; -then - cd tor-browser - git fetch origin - git fetch --tags origin - git checkout $TORBROWSER_TAG - cd .. -else - git clone https://git.torproject.org/tor-browser.git || exit 1 - cd tor-browser - git checkout $TORBROWSER_TAG - cd .. -fi +while read dir url tag; do + update_git "$dir" "$url" "$tag" +done << EOF +tbb-windows-installer https://github.com/moba/tbb-windows-installer.git +zlib https://github.com/madler/zlib.git +libevent https://github.com/libevent/libevent.git +tor-launcher https://git.torproject.org/tor-launcher.git +tor https://git.torproject.org/tor.git +torbutton https://git.torproject.org/torbutton.git +https-everywhere https://git.torproject.org/https-everywhere.git +tor-browser https://git.torproject.org/tor-browser.git $TORBROWSER_TAG +EOF exit 0 diff --git a/gitian/gpg/OPENSSL.gpg b/gitian/gpg/OPENSSL.gpg new file mode 100644 index 0000000..1b282b7 Binary files /dev/null and b/gitian/gpg/OPENSSL.gpg differ

1 0