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

[flashproxy/master] Using pyobfsproxy master, not 0.0.2, for py2exe compatibility.
by dcf＠torproject.org 15 Mar '13

15 Mar '13

commit b64224a91cca05e75edb229f9501fb249c5eca45 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Mar 15 00:02:18 2013 -0700 Using pyobfsproxy master, not 0.0.2, for py2exe compatibility. I'm currently using a7631dc6 of pyobfsproxy. --- doc/bundle-gnulinux.txt | 1 - doc/bundle-macosx.txt | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/doc/bundle-gnulinux.txt b/doc/bundle-gnulinux.txt index e65177d..7b2dc30 100644 --- a/doc/bundle-gnulinux.txt +++ b/doc/bundle-gnulinux.txt @@ -85,7 +85,6 @@ Clone pyobfsproxy. $ git clone https://git.torproject.org/pluggable-transports/pyobfsproxy.git $ cd pyobfsproxy - $ git checkout pyobfsproxy-0.0.2 Update your Debian. diff --git a/doc/bundle-macosx.txt b/doc/bundle-macosx.txt index 4993b46..bdaf700 100644 --- a/doc/bundle-macosx.txt +++ b/doc/bundle-macosx.txt @@ -68,7 +68,6 @@ Clone pyobfsproxy. $ git clone https://git.torproject.org/pluggable-transports/pyobfsproxy.git $ cd pyobfsproxy - $ git checkout pyobfsproxy-0.0.2 Download the 32-bit browser bundle from https://www.torproject.org/projects/torbrowser.html.en#Download-torbrowserb….

1 0

[flashproxy/master] New TBB alpha version.
by dcf＠torproject.org 15 Mar '13

15 Mar '13

commit a35643f82bda0b4dd60f7214e89d3f7bd19c1994 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Mar 14 23:50:14 2013 -0700 New TBB alpha version. --- doc/bundle-gnulinux.txt | 18 +++++++++--------- doc/bundle-macosx.txt | 14 +++++++------- doc/bundle-windows.txt | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/doc/bundle-gnulinux.txt b/doc/bundle-gnulinux.txt index 4a2aa18..e65177d 100644 --- a/doc/bundle-gnulinux.txt +++ b/doc/bundle-gnulinux.txt @@ -96,17 +96,17 @@ Within the VM, download the 32-bit or 64-bit browser bundle from https://www.torproject.org/projects/torbrowser.html.en#Download-torbrowserb…. The instructions below are for the 32-bit (i686) version. -https://www.torproject.org/dist/torbrowser/linux/tor-browser-gnu-linux-i686-2.4.10-alpha-2-dev-en-US.tar.gz -https://www.torproject.org/dist/torbrowser/linux/tor-browser-gnu-linux-i686-2.4.10-alpha-2-dev-en-US.tar.gz.asc +https://www.torproject.org/dist/torbrowser/linux/tor-browser-gnu-linux-i686-2.4.11-alpha-1-dev-en-US.tar.gz +https://www.torproject.org/dist/torbrowser/linux/tor-browser-gnu-linux-i686-2.4.11-alpha-1-dev-en-US.tar.gz.asc -https://www.torproject.org/dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-2.4.10-alpha-2-dev-en-US.tar.gz -https://www.torproject.org/dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-2.4.10-alpha-2-dev-en-US.tar.gz.asc +https://www.torproject.org/dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-2.4.11-alpha-1-dev-en-US.tar.gz +https://www.torproject.org/dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-2.4.11-alpha-1-dev-en-US.tar.gz.asc Extract the bundle. - $ gpg --verify tor-browser-gnu-linux-i686-2.4.10-alpha-2-dev-en-US.tar.gz.asc + $ gpg --verify tor-browser-gnu-linux-i686-2.4.11-alpha-1-dev-en-US.tar.gz.asc $ rm -r tor-browser_en-US - $ tar xzvf tor-browser-gnu-linux-i686-2.4.10-alpha-2-dev-en-US.tar.gz + $ tar xzvf tor-browser-gnu-linux-i686-2.4.11-alpha-1-dev-en-US.tar.gz Copy files into the bundle. @@ -155,14 +155,14 @@ Re-zip the bundle. The "alpha" number should be independent of the browser bundle's alpha. $ cd .. - $ tar czvf tor-flashproxy-pyobfsproxy-browser-gnu-linux-i686-2.4.10-alpha-2-dev-en-US.tar.gz tor-browser_en-US + $ tar czvf tor-flashproxy-pyobfsproxy-browser-gnu-linux-i686-2.4.11-alpha-1-dev-en-US.tar.gz tor-browser_en-US Test running the bundle. Extract into a separate directory, double-click the icon to unzip, and run TorBrowser_en-US.app. $ mkdir tmp - $ cp tor-flashproxy-pyobfsproxy-browser-gnu-linux-i686-2.4.10-alpha-2-dev-en-US.tar.gz tmp + $ cp tor-flashproxy-pyobfsproxy-browser-gnu-linux-i686-2.4.11-alpha-1-dev-en-US.tar.gz tmp $ cd tmp - $ tar xzvf tor-flashproxy-pyobfsproxy-browser-gnu-linux-i686-2.4.10-alpha-2-dev-en-US.tar.gz + $ tar xzvf tor-flashproxy-pyobfsproxy-browser-gnu-linux-i686-2.4.11-alpha-1-dev-en-US.tar.gz $ cd tor-browser_en-US $ ./start-tor-browser diff --git a/doc/bundle-macosx.txt b/doc/bundle-macosx.txt index 8e2a8e0..4993b46 100644 --- a/doc/bundle-macosx.txt +++ b/doc/bundle-macosx.txt @@ -73,14 +73,14 @@ Clone pyobfsproxy. Download the 32-bit browser bundle from https://www.torproject.org/projects/torbrowser.html.en#Download-torbrowserb…. -https://www.torproject.org/dist/torbrowser/osx/TorBrowser-2.4.10-alpha-2-osx-i386-en-US.zip -https://www.torproject.org/dist/torbrowser/osx/TorBrowser-2.4.10-alpha-2-osx-i386-en-US.zip.asc +https://www.torproject.org/dist/torbrowser/osx/TorBrowser-2.4.11-alpha-1-osx-i386-en-US.zip +https://www.torproject.org/dist/torbrowser/osx/TorBrowser-2.4.11-alpha-1-osx-i386-en-US.zip.asc Extract the bundle. - $ gpg --verify TorBrowser-2.4.10-alpha-2-osx-i386-en-US.zip.asc + $ gpg --verify TorBrowser-2.4.11-alpha-1-osx-i386-en-US.zip.asc $ rm -r TorBrowser_en-US.app - $ unzip TorBrowser-2.4.10-alpha-2-osx-i386-en-US.zip + $ unzip TorBrowser-2.4.11-alpha-1-osx-i386-en-US.zip Copy files into the bundle. @@ -127,11 +127,11 @@ Re-zip the bundle. The "alpha" number should be independent of the browser bundle's alpha. $ cd .. - $ rm -f TorBrowser-FlashProxy-PyObfsproxy-2.4.10-alpha-2-osx-i386-en-US.zip - $ zip -r -9 TorBrowser-FlashProxy-PyObfsproxy-2.4.10-alpha-2-osx-i386-en-US.zip TorBrowser_en-US.app/ + $ rm -f TorBrowser-FlashProxy-PyObfsproxy-2.4.11-alpha-1-osx-i386-en-US.zip + $ zip -r -9 TorBrowser-FlashProxy-PyObfsproxy-2.4.11-alpha-1-osx-i386-en-US.zip TorBrowser_en-US.app/ Test running the bundle. Extract into a separate directory, double-click the icon to unzip, and run TorBrowser_en-US.app. $ mkdir tmp - $ cp TorBrowser-FlashProxy-PyObfsproxy-2.4.10-alpha-2-osx-i386-en-US.zip tmp + $ cp TorBrowser-FlashProxy-PyObfsproxy-2.4.11-alpha-1-osx-i386-en-US.zip tmp diff --git a/doc/bundle-windows.txt b/doc/bundle-windows.txt index f355774..330e6f3 100644 --- a/doc/bundle-windows.txt +++ b/doc/bundle-windows.txt @@ -81,14 +81,14 @@ Clone pyobfsproxy and run py2exe on it. Download the browser bundle from https://www.torproject.org/projects/torbrowser.html.en#Download-torbrowserb…. -https://www.torproject.org/dist/torbrowser/tor-browser-2.4.10-alpha-2_en-US.exe -https://www.torproject.org/dist/torbrowser/tor-browser-2.4.10-alpha-2_en-US.exe.asc +https://www.torproject.org/dist/torbrowser/tor-browser-2.4.11-alpha-1_en-US.exe +https://www.torproject.org/dist/torbrowser/tor-browser-2.4.11-alpha-1_en-US.exe.asc Extract the bundle. - $ gpg --verify tor-browser-2.4.10-alpha-2_en-US.exe.asc + $ gpg --verify tor-browser-2.4.11-alpha-1_en-US.exe.asc $ rm -r "Tor Browser" - $ "/cygdrive/c/Program Files (x86)/7-Zip/7z" x tor-browser-2.4.10-alpha-2_en-US.exe + $ "/cygdrive/c/Program Files (x86)/7-Zip/7z" x tor-browser-2.4.11-alpha-1_en-US.exe Copy files into the bundle. The -n option to cp prevents the existing LIBEAY32.dll and SSLEAY32.dll from being overwritten. @@ -134,10 +134,10 @@ browser bundle's alpha. The 7zg program (as opposed to 7z) causes the self-extractor to show a GUI. $ cd .. - $ "/cygdrive/c/Program Files (x86)/7-Zip/7zg" a -sfx tor-flashproxy-pyobfsproxy-browser-2.4.10-alpha-2_en-US.exe "Tor Browser" + $ "/cygdrive/c/Program Files (x86)/7-Zip/7zg" a -sfx tor-flashproxy-pyobfsproxy-browser-2.4.11-alpha-1_en-US.exe "Tor Browser" Test running the bundle. Extract into a separate directory, double-click the icon and "Start Tor Browser.exe". $ mkdir tmp - $ cp tor-flashproxy-pyobfsproxy-browser-2.4.10-alpha-2_en-US.exe tmp + $ cp tor-flashproxy-pyobfsproxy-browser-2.4.11-alpha-1_en-US.exe tmp

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 15 Mar '13

15 Mar '13

commit 4cdd9776cad3d9086ce10af3aba9cb15da7ae9ab Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 15 06:45:23 2013 +0000 Update translations for vidalia_alpha --- nb/vidalia_nb.po | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/nb/vidalia_nb.po b/nb/vidalia_nb.po index b339aee..c214218 100644 --- a/nb/vidalia_nb.po +++ b/nb/vidalia_nb.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2013-01-25 12:06+0000\n" +"PO-Revision-Date: 2013-03-15 06:43+0000\n" "Last-Translator: trash <nicolaip(a)outlook.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -226,7 +226,7 @@ msgid "" "You've checked the autoconfiguration option for the ControlPort, but " "provided no Data Directory. Please add one, or uncheck the \"Configure " "ControlPort automatically\" option." -msgstr "" +msgstr "Du har valgt automatiske innstillinger for KontrollPorten, men ikke oppgitt en data-mappe. Vennligst oppgi en data-mappe, eller ikke velg \"Automatisk KontrollPort Innstillinger.\"" msgctxt "AdvancedPage" msgid "" @@ -262,7 +262,7 @@ msgstr "Vidalia kunne ikke laste inn den valgte språkoversettelsen" msgctxt "AppearancePage" msgid "" "System Icon Preferences (changes will take effect when you restart Vidalia)" -msgstr "" +msgstr "Innstillinger for system-ikoner (forandringer oppdateres når Vidalia starter neste gang)" msgctxt "AppearancePage" msgid "Show the Tray Icon and Dock Icon (default)" @@ -1362,23 +1362,23 @@ msgctxt "CrashReportDialog" msgid "" "with a description of what you were doing before the application crashed, " "along with the following files corresponding to the crash report:" -msgstr "" +msgstr "med en beskrivelse av hva du gjorde før programmet krasjet, med de følgende filene beskrevet i krasj-rapporten:" msgctxt "DebugDialog" msgid "Plugin debug output" -msgstr "" +msgstr "Programtillegg feilrettingsutfall" msgctxt "DebugDialog" msgid "Plugin Output" -msgstr "" +msgstr "Programtillegg Utfall" msgctxt "DebugDialog" msgid "Syntax Errors" -msgstr "" +msgstr "Syntaksfeil" msgctxt "DebugDialog" msgid "Exceptions" -msgstr "" +msgstr "Unntak" msgctxt "GeneralPage" msgid "Executables (*.exe)" @@ -3494,7 +3494,7 @@ msgctxt "StatusEventWidget" msgid "" "Your relay's descriptor, which enables clients to connect to your relay, was" " rejected by the directory server at %1:%2. The reason given was: %3" -msgstr "" +msgstr "Din relay-beskriver, som gjør det mulig for andre å koble seg til ditt relay, ble nektet tilgang av katalog-serveren på %1:%2. Oppgitt årsak: %3." msgctxt "StatusEventWidget" msgid "Your Relay is Online" @@ -3506,7 +3506,7 @@ msgid "" "see an increase in network traffic shown by the Bandwidth Graph within a few" " hours as more clients learn about your relay. Thank you for contributing to" " the Tor network!" -msgstr "" +msgstr "Ditt relay er nå koblet til nettet og klart til bruk for andre i Tor-nettverket. Du burde se en økning i internett-trafikk i trafikk-grafen i løpet av noen timer, etter som flere og flere brukere får vite om ditt relay. Takk for at du bidrar til Tor-nettverket!" msgctxt "StatusTab" msgid "Status" @@ -3564,7 +3564,7 @@ msgctxt "TorControl" msgid "" "Vidalia has not started Tor. You need to stop Tor through the interface you " "started it." -msgstr "" +msgstr "Vidalia har ikke startet Tor. Du må stoppe Tor via grensesnittet hvor du startet den." msgctxt "TorControl" msgid "Start failed: %1"

1 0

[translation/tsum_completed] Update translations for tsum_completed
by translation＠torproject.org 15 Mar '13

15 Mar '13

commit 0fb41180f0dc69310637fb24f155a61607b319f9 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 15 06:45:15 2013 +0000 Update translations for tsum_completed --- nb/short-user-manual_nb_noimg.xhtml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nb/short-user-manual_nb_noimg.xhtml b/nb/short-user-manual_nb_noimg.xhtml index 7a1f9b4..531a89a 100644 --- a/nb/short-user-manual_nb_noimg.xhtml +++ b/nb/short-user-manual_nb_noimg.xhtml @@ -42,7 +42,7 @@ Du burde nå se: <pre> <code>pub 2048R/63FEE659 2003-10-16 - Key fingerprint = 8738 A680 B84B 3031 A630 F2DB 416F 0610 63FE E659 + Nøkkel avtrykk = 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> @@ -57,7 +57,7 @@ sub 2048R/EB399FD7 2003-10-16 Du skal da få "Good signature" i svar. En falsk signatur ("Bad signature") betyr at det kan ha vært gjort endringer i filen som vi ikke har godkjent. Hvis du ser en falsk signatur, send detaljer om hvor du lastet ned pakken fra, hvordan du verifiserte signaturen, og svaret du fikk fra kommandoen du gjorde i GnuPG i en email til help(a)rt.torproject.org. Så fort du har verifisert signaturen og fått "Good signature" som svar, kan du pakke ut filene. Det vil da opprettes en filmappe som heter tor-browser_en-US eller liknende. Inne i den mappa finner du en annen mappe som heter Docs, som inneholder en fil som heter changelog. Du bør forsikre deg om at versjonsnummeret på øverste linje i denne changelog-fila stemmer med versjonsnummeret på filnavnet til hoved-pakken du lastet ned. <h3 id="how-to-use-the-tor-browser-bundle">Hvordan bruke Tor Nettleser Pakken:</h3> - Etter å ha lastet ned Tor Nettleser Pakken, pakk ut program-pakken til skrivebordet eller på en minnepinne. Du skal ha en mappe som inneholder noen filer. En av filene er en kjørbar fil som heter "Start Tor Browser" (eller "start-tor-browser," avhengig av ditt operativsystem). + Etter at du har lastet ned Tor Browser Bundle kan du pakke ut program-pakken til skrivebordet eller på en minnepinne. Du skal da få en mappe som inneholder flere filer. En av disse filene heter "Start Tor Browser" (eller "start-tor-browser" avhengig av hvilket operativ system du kjører) og er kjørbar. Når du starter Tor Nettleser Pakken vil du først se et program som heter Vidalia starte opp som vil koble deg til Tor nettverket. Når det er gjort, vil nettleseren automatisk starte opp og ta deg til en side som bekrefter at du nå bruker Tor, <a href="https://check.torproject.org/">https://check.torproject.org/</a>, og vise teksten You can now browse the Internet through Tor. Vær oppmerksom på at det er viktig at du bruker nettleseren som følger med pakken, og ikke en annen nettleser.

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 15 Mar '13

15 Mar '13

commit 9c9e29a49a8116e875147a33aba23e94f90d5c00 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 15 06:45:12 2013 +0000 Update translations for tsum --- nb/short-user-manual_nb_noimg.xhtml | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/nb/short-user-manual_nb_noimg.xhtml b/nb/short-user-manual_nb_noimg.xhtml index 3ba73ce..531a89a 100644 --- a/nb/short-user-manual_nb_noimg.xhtml +++ b/nb/short-user-manual_nb_noimg.xhtml @@ -22,12 +22,12 @@ NB: Tor Nettleser Pakken for Mac OS X og Linux er relativt store, og du kan ikke motta disse på Gmail, Hotmail eller Yahoo. Hvis dette er tilfellet for deg, send oss en email på help(a)rt.torproject.org og vi kan sende deg en liste over alternative nettsider du kan bruke. <h3 id="tor-for-smartphones">Tor for smart-telefoner:</h3> Du kan få Tor på smart-telefonen din ved å installere en software-pakke som heter Orbot. For informasjon om hvordan du kan laste ned og installere Orbot, vennligst gå til <<a href="https://www.torproject.org/docs/android.html.en">Tor Prosjektets nettside.</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>. + Vi har også eksperimentelle program-pakker for <a href="https://www.torproject.org/docs/N900.html.en">Nokia Maemo/N900</a> og <a href="http://sid77.slackware.it/ios/">Apple iOS</a>. <h3 id="how-to-verify-that-you-have-the-right-version">Hvordan sjekke at du har riktig versjon:</h3> Før du bruker Tor Nettleser Pakken, burde du forsikre deg om at du har riktig versjon. Når du laster ned program-pakken følger det med en fil som har samme navn som program-pakken, men etterfulgt av <.asc> i navnet. Denne .asc filen er en GPG signatur, som gjør at du kan forsikre deg om at programmet du har lastet ned inneholder nøyaktig det vi har laget - med andre ord at ingen har tuklet med programmet uten vår viten. For å verifisere signaturen må du laste ned programmet 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: De fleste Linux distribusjoner kommer med GnuPG ferdig installert. + Windows: <a href="http://gpg4win.org/download.html">http://gpg4win.org/download.html</a> Mac OS X: <a href="http://www.gpgtools.org/">http://www.gpgtools.org/</a> Linux: De fleste Linux distribusjoner kommer med GnuPG ferdig installert. Vær oppmerksom på at du kanskje må forandre på filplasseringen og kommandoene brukt i eksempelet under for at det skal fungere på ditt system. Erinn Clark signerer Tor Nettleser Pakken med nøkkelen 0x63FEE659. For å importere Erinns nøkkel, kjør <pre> @@ -42,10 +42,9 @@ Du burde nå se: <pre> <code>pub 2048R/63FEE659 2003-10-16 - Key fingerprint = 8738 A680 B84B 3031 A630 F2DB 416F 0610 63FE E659 + Nøkkel avtrykk = 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> @@ -58,7 +57,7 @@ sub 2048R/EB399FD7 2003-10-16 Du skal da få "Good signature" i svar. En falsk signatur ("Bad signature") betyr at det kan ha vært gjort endringer i filen som vi ikke har godkjent. Hvis du ser en falsk signatur, send detaljer om hvor du lastet ned pakken fra, hvordan du verifiserte signaturen, og svaret du fikk fra kommandoen du gjorde i GnuPG i en email til help(a)rt.torproject.org. Så fort du har verifisert signaturen og fått "Good signature" som svar, kan du pakke ut filene. Det vil da opprettes en filmappe som heter tor-browser_en-US eller liknende. Inne i den mappa finner du en annen mappe som heter Docs, som inneholder en fil som heter changelog. Du bør forsikre deg om at versjonsnummeret på øverste linje i denne changelog-fila stemmer med versjonsnummeret på filnavnet til hoved-pakken du lastet ned. <h3 id="how-to-use-the-tor-browser-bundle">Hvordan bruke Tor Nettleser Pakken:</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). + Etter at du har lastet ned Tor Browser Bundle kan du pakke ut program-pakken til skrivebordet eller på en minnepinne. Du skal da få en mappe som inneholder flere filer. En av disse filene heter "Start Tor Browser" (eller "start-tor-browser" avhengig av hvilket operativ system du kjører) og er kjørbar. Når du starter Tor Nettleser Pakken vil du først se et program som heter Vidalia starte opp som vil koble deg til Tor nettverket. Når det er gjort, vil nettleseren automatisk starte opp og ta deg til en side som bekrefter at du nå bruker Tor, <a href="https://check.torproject.org/">https://check.torproject.org/</a>, og vise teksten You can now browse the Internet through Tor. Vær oppmerksom på at det er viktig at du bruker nettleseren som følger med pakken, og ikke en annen nettleser.

1 0

[flashproxy/master] Add man page for flashproxy-reg-url.
by dcf＠torproject.org 15 Mar '13

15 Mar '13

commit 84121a13013ec043f0c1228edaed44346e3143a9 Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Wed Mar 13 19:20:59 2013 -0400 Add man page for flashproxy-reg-url. --- doc/flashproxy-reg-url.1 | 78 ++++++++++++++++++++++++++++++++++++++++++ doc/flashproxy-reg-url.1.txt | 59 +++++++++++++++++++++++++++++++ 2 files changed, 137 insertions(+), 0 deletions(-) diff --git a/doc/flashproxy-reg-url.1 b/doc/flashproxy-reg-url.1 new file mode 100644 index 0000000..58a537f --- /dev/null +++ b/doc/flashproxy-reg-url.1 @@ -0,0 +1,78 @@ +'\" t +.\" Title: flashproxy-reg-url +.\" Author: [see the "AUTHORS" section] +.\" Generator: DocBook XSL Stylesheets v1.78.0 <http://docbook.sf.net/> +.\" Date: 03/13/2013 +.\" Manual: \ \& +.\" Source: \ \& +.\" Language: English +.\" +.TH "FLASHPROXY\-REG\-URL" "1" "03/13/2013" "\ \&" "\ \&" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +flashproxy-reg-url \- Register with a facilitator using an indirect URL +.SH "SYNOPSIS" +.sp +\fBflashproxy\-reg\-url\fR [\fIOPTIONS\fR] \fIREMOTE\fR[:\fIPORT\fR] +.SH "DESCRIPTION" +.sp +Print a URL, which, when retrieved, will cause the client address \fIREMOTE\fR[:\fIPORT\fR] to be registered with the flash proxy facilitator\&. The default \fIPORT\fR is 9000\&. +.SH "OPTIONS" +.PP +\fB\-f\fR, \fB\-\-facilitator\fR=\fIURL\fR +.RS 4 +Register with the given facilitator (by default "https://tor\-facilitator\&.bamsoftware\&.com/")\&. +.RE +.PP +\fB\-h\fR, \fB\-\-help\fR +.RS 4 +Display help message and exit\&. +.RE +.SH "EXAMPLE" +.sp +Say you wish to register 101\&.202\&.10\&.20:9000\&. Run +.sp +.if n \{\ +.RS 4 +.\} +.nf +\&./flashproxy\-reg\-url 101\&.202\&.10\&.20:9000 +.fi +.if n \{\ +.RE +.\} +.sp +The program should output a long string looking something like +.sp +https://tor\-facilitator\&.bamsoftware\&.com/reg/0labtDob545HeKpLZ8LqGeOi\-OK7HXoQvfQzj0P2pjh1NrCKNDaPe91zo\&.\&.\&. +.sp +Copy this string and paste it into any URL fetching website or program\&. An example would be the W3C Markup Validation Service at http://validator\&.w3\&.org\&. Once the URL is retrieved your address will be registered with the facilitator\&. +.SH "SEE ALSO" +.sp +\fBhttp://crypto\&.stanford\&.edu/flashproxy/\fR +.sp +\fBhttps://www\&.torproject\&.org/docs/pluggable\-transports\&.html\&.en\fR +.SH "BUGS" +.sp +Please report using \fBhttps://trac\&.torproject\&.org/projects/tor\fR\&. +.SH "AUTHORS" +.sp +David Fifield [dcf at torproject\&.org]\&. diff --git a/doc/flashproxy-reg-url.1.txt b/doc/flashproxy-reg-url.1.txt new file mode 100644 index 0000000..e8b8acc --- /dev/null +++ b/doc/flashproxy-reg-url.1.txt @@ -0,0 +1,59 @@ +// This file is asciidoc source code. +// To generate manpages, use the a2x command. +// This one has a long name, if you don't change the +// default length parameter it will be truncated, use: +// a2x --no-xmllint --xsltproc-opts "--stringparam man.th.title.max.length 23" -d manpage -f manpage flashproxy-reg-url.1.txt +FLASHPROXY-REG-URL(1) +===================== + +NAME +---- +flashproxy-reg-url - Register with a facilitator using an indirect URL + +SYNOPSIS +-------- +**flashproxy-reg-url** [__OPTIONS__] __REMOTE__[:__PORT__] + +DESCRIPTION +----------- +Print a URL, which, when retrieved, will cause the client address +__REMOTE__[:__PORT__] to be registered with the flash proxy facilitator. The +default __PORT__ is 9000. + +OPTIONS +------- +**-f**, **--facilitator**=__URL__:: + Register with the given facilitator (by default "https://tor-facilitator.bamsoftware.com/"). + +**-h**, **--help**:: + Display help message and exit. + +EXAMPLE +------- +Say you wish to register 101.202.10.20:9000. Run + +....................................... +./flashproxy-reg-url 101.202.10.20:9000 +....................................... + +The program should output a long string looking something like + +https://tor-facilitator.bamsoftware.com/reg/0labtDob545HeKpLZ8LqGeOi-OK7HXoQvfQzj0P2pjh1NrCKNDaPe91zo\... + +Copy this string and paste it into any URL fetching website or program. +An example would be the W3C Markup Validation Service at http://validator.w3.org. +Once the URL is retrieved your address will be registered with the facilitator. + +SEE ALSO +-------- +**http://crypto.stanford.edu/flashproxy/** + +**https://www.torproject.org/docs/pluggable-transports.html.en** + +BUGS +---- +Please report using **https://trac.torproject.org/projects/tor**. + +AUTHORS +------- +David Fifield [dcf at torproject.org]

1 0

[flashproxy/master] Add flashproxy-reg-url manpage to Makefile.
by dcf＠torproject.org 15 Mar '13

15 Mar '13

commit 79c48a9266662e2177fc5d07a5adad2bcf79e8f4 Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Wed Mar 13 19:22:24 2013 -0400 Add flashproxy-reg-url manpage to Makefile. --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index ccf9718..c132c72 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ PYINSTALLER_PY = ../pyinstaller-2.0/pyinstaller.py export PYINSTALLER_TMPDIR = pyinstaller-tmp CLIENT_BIN = flashproxy-client flashproxy-reg-email flashproxy-reg-http -CLIENT_MAN = doc/flashproxy-client.1 doc/flashproxy-reg-email.1 doc/flashproxy-reg-http.1 +CLIENT_MAN = doc/flashproxy-client.1 doc/flashproxy-reg-email.1 doc/flashproxy-reg-http.1 doc/flashproxy-reg-url.1 CLIENT_DIST_FILES = $(CLIENT_BIN) README LICENSE ChangeLog torrc CLIENT_DIST_DOC_FILES = $(CLIENT_MAN) doc/LICENSE.GPL doc/LICENSE.PYTHON

1 0

[flashproxy/master] Merge remote-tracking branch 'aallai/url_reg'
by dcf＠torproject.org 15 Mar '13

15 Mar '13

commit f7db272603b3c447ce0fc52f142411c2135f9887 Merge: 85bd104 773a6fe Author: David Fifield <david(a)bamsoftware.com> Date: Thu Mar 14 23:39:32 2013 -0700 Merge remote-tracking branch 'aallai/url_reg' Conflicts: Makefile Makefile | 2 +- doc/flashproxy-reg-url.1 | 78 ++++++++++++++++++++++++++++++++++++++++++ doc/flashproxy-reg-url.1.txt | 58 +++++++++++++++++++++++++++++++ 3 files changed, 137 insertions(+), 1 deletions(-) diff --cc Makefile index 9483f75,c132c72..8d76772 --- a/Makefile +++ b/Makefile @@@ -5,10 -5,11 +5,10 @@@ BINDIR = $(PREFIX)/bi MANDIR = $(PREFIX)/share/man PYTHON = python -PYINSTALLER_PY = ../pyinstaller-2.0/pyinstaller.py -export PYINSTALLER_TMPDIR = pyinstaller-tmp +export PY2EXE_TMPDIR = py2exe-tmp -CLIENT_BIN = flashproxy-client flashproxy-reg-email flashproxy-reg-http +CLIENT_BIN = flashproxy-client flashproxy-reg-email flashproxy-reg-http flashproxy-reg-url - CLIENT_MAN = doc/flashproxy-client.1 doc/flashproxy-reg-email.1 doc/flashproxy-reg-http.1 + CLIENT_MAN = doc/flashproxy-client.1 doc/flashproxy-reg-email.1 doc/flashproxy-reg-http.1 doc/flashproxy-reg-url.1 CLIENT_DIST_FILES = $(CLIENT_BIN) README LICENSE ChangeLog torrc CLIENT_DIST_DOC_FILES = $(CLIENT_MAN) doc/LICENSE.GPL doc/LICENSE.PYTHON

1 0

[flashproxy/master] Use address reserved for documentation in manpage.
by dcf＠torproject.org 15 Mar '13

15 Mar '13

commit 773a6fe2cb107b58f3bc4a24101500819d6d8b21 Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Wed Mar 13 19:52:59 2013 -0400 Use address reserved for documentation in manpage. --- doc/flashproxy-reg-url.1 | 6 +++--- doc/flashproxy-reg-url.1.txt | 9 ++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/doc/flashproxy-reg-url.1 b/doc/flashproxy-reg-url.1 index 58a537f..c5289b5 100644 --- a/doc/flashproxy-reg-url.1 +++ b/doc/flashproxy-reg-url.1 @@ -48,13 +48,13 @@ Display help message and exit\&. .RE .SH "EXAMPLE" .sp -Say you wish to register 101\&.202\&.10\&.20:9000\&. Run +Say you wish to register 192\&.0\&.2\&.1:9000\&. Run .sp .if n \{\ .RS 4 .\} .nf -\&./flashproxy\-reg\-url 101\&.202\&.10\&.20:9000 +\&./flashproxy\-reg\-url 192\&.0\&.2\&.1:9000 .fi .if n \{\ .RE @@ -64,7 +64,7 @@ The program should output a long string looking something like .sp https://tor\-facilitator\&.bamsoftware\&.com/reg/0labtDob545HeKpLZ8LqGeOi\-…. .sp -Copy this string and paste it into any URL fetching website or program\&. An example would be the W3C Markup Validation Service at http://validator\&.w3\&.org\&. Once the URL is retrieved your address will be registered with the facilitator\&. +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\&. .SH "SEE ALSO" .sp \fBhttp://crypto\&.stanford\&.edu/flashproxy/\fR diff --git a/doc/flashproxy-reg-url.1.txt b/doc/flashproxy-reg-url.1.txt index e8b8acc..2680060 100644 --- a/doc/flashproxy-reg-url.1.txt +++ b/doc/flashproxy-reg-url.1.txt @@ -30,18 +30,17 @@ OPTIONS EXAMPLE ------- -Say you wish to register 101.202.10.20:9000. Run +Say you wish to register 192.0.2.1:9000. Run -....................................... -./flashproxy-reg-url 101.202.10.20:9000 -....................................... +................................... +./flashproxy-reg-url 192.0.2.1:9000 +................................... The program should output a long string looking something like https://tor-facilitator.bamsoftware.com/reg/0labtDob545HeKpLZ8LqGeOi-OK7HXo…... Copy this string and paste it into any URL fetching website or program. -An example would be the W3C Markup Validation Service at http://validator.w3.org. Once the URL is retrieved your address will be registered with the facilitator. SEE ALSO

1 0

[flashproxy/master] Use sys.executable to get script directory when frozen.
by dcf＠torproject.org 15 Mar '13

15 Mar '13

commit a3f93c2335c22ed5002a6e4825d35e6c7055e89b Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Tue Mar 12 20:00:54 2013 -0700 Use sys.executable to get script directory when frozen. py2exe overwrites sys.path[0], and the paths to the registration helpers end up wrong. If we are frozen, use dirname(sys.executable) instead of sys.path[0]. --- flashproxy-client | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/flashproxy-client b/flashproxy-client index e9795fa..22ce072 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -945,8 +945,12 @@ def proxy_loop(): report_pending() def build_register_command(method): - # sys.path[0] is initialized to the directory containing the Python script file. - script_dir = sys.path[0] + # sys.path[0] usually contains the directory the script is located in. + # py2exe overwrites this for bundled executables. + if getattr(sys, "frozen", False): + script_dir = os.path.dirname(sys.executable) + else: + script_dir = sys.path[0] if not script_dir: # Maybe the script was read from stdin; in any case don't guess at the directory. raise ValueError("Can't find executable directory for registration helpers")

1 0