November 2012 - tor-commits - lists.torproject.org

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 17 Nov '12

17 Nov '12

commit 80c4a430b93a90b8e4dc397cbba7e789d9f94335 Merge: b53024f 90a083f Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Nov 17 01:02:10 2012 +0000 Merge branch 'maint-2.2' into maint-2.3 build-scripts/versions.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)

1 0

[torbrowser/master] bump firefox to 10.0.11esr
by erinn＠torproject.org 17 Nov '12

17 Nov '12

commit 90a083f188024b0ac9482997ac68ecd950fd4739 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Nov 17 01:01:40 2012 +0000 bump firefox to 10.0.11esr --- build-scripts/versions.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index bb2f3a3..8cd07bc 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -10,12 +10,12 @@ VIDALIA_VER=0.2.20 LIBEVENT_VER=2.0.20-stable TOR_VER=0.2.2.39 PIDGIN_VER=2.6.4 -FIREFOX_VER=10.0.10esr +FIREFOX_VER=10.0.11esr MOZBUILD_VER=1.5.1 PYMAKE_VER=87d436cd8974 TORBUTTON_VER=1.4.6.3 -NOSCRIPT_VER=2.5.9 -HTTPSEVERYWHERE_VER=3.0.2 +NOSCRIPT_VER=2.6.1 +HTTPSEVERYWHERE_VER=3.0.4 OTR_VER=3.2.0 OBFSPROXY_VER=0.1.4

1 0

[torbrowser/master] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 17 Nov '12

17 Nov '12

commit 80c4a430b93a90b8e4dc397cbba7e789d9f94335 Merge: b53024f 90a083f Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Nov 17 01:02:10 2012 +0000 Merge branch 'maint-2.2' into maint-2.3 build-scripts/versions.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)

1 0

[torbrowser/master] bump firefox to 10.0.11esr
by erinn＠torproject.org 17 Nov '12

17 Nov '12

commit 1939421f547c3247d49f5ce72691ca266cda73bc Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Nov 17 01:03:13 2012 +0000 bump firefox to 10.0.11esr --- build-scripts/versions-alpha.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index 1405760..4d64291 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -10,11 +10,11 @@ VIDALIA_VER=0.2.20 LIBEVENT_VER=2.0.20-stable TOR_VER=0.2.3.24-rc PIDGIN_VER=2.6.4 -FIREFOX_VER=10.0.10esr +FIREFOX_VER=10.0.11esr MOZBUILD_VER=1.5.1 PYMAKE_VER=87d436cd8974 TORBUTTON_VER=1.4.6.3 -NOSCRIPT_VER=2.5.9 +NOSCRIPT_VER=2.6.1 HTTPSEVERYWHERE_VER=4.0development.2 OBFSPROXY_VER=0.1.4 OTR_VER=3.2.0

1 0

[translation/vidalia_alpha_completed] Update translations for vidalia_alpha_completed
by translation＠torproject.org 16 Nov '12

16 Nov '12

commit a0b6131de43d8f653b819c06d5db434f0b775dbb Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 16 17:15:26 2012 +0000 Update translations for vidalia_alpha_completed --- es/vidalia_es.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index c6adbba..53dccb1 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,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: 2012-11-16 11:23+0000\n" +"PO-Revision-Date: 2012-11-16 16:50+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -50,7 +50,7 @@ msgstr "Ha seleccionado autentificación por 'Contraseña', pero no ha especific msgctxt "AdvancedPage" msgid "Select Tor Configuration File" -msgstr "Seleccione el Archivo de Configuración de Tor" +msgstr "Seleccione el archivo de configuración de Tor" msgctxt "AdvancedPage" msgid "File Not Found"

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 16 Nov '12

16 Nov '12

commit b90aa38cd8e40c0a1c1458ed9fdb3ff1384c1ae7 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 16 17:15:23 2012 +0000 Update translations for vidalia_alpha --- es/vidalia_es.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index c6adbba..53dccb1 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,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: 2012-11-16 11:23+0000\n" +"PO-Revision-Date: 2012-11-16 16:50+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -50,7 +50,7 @@ msgstr "Ha seleccionado autentificación por 'Contraseña', pero no ha especific msgctxt "AdvancedPage" msgid "Select Tor Configuration File" -msgstr "Seleccione el Archivo de Configuración de Tor" +msgstr "Seleccione el archivo de configuración de Tor" msgctxt "AdvancedPage" msgid "File Not Found"

1 0

[tor/master] when counting available descs, say whether we're counting exits
by arma＠torproject.org 16 Nov '12

16 Nov '12

commit 06d367ea365ff3e6c1e181567906a9cb319a87c3 Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Nov 16 11:38:56 2012 -0500 when counting available descs, say whether we're counting exits --- src/or/nodelist.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 5a72637..7bb5e4f 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -1269,8 +1269,9 @@ count_usable_descriptors(int *num_present, int *num_usable, } SMARTLIST_FOREACH_END(rs); - log_debug(LD_DIR, "%d usable, %d present (%s).", *num_usable, *num_present, - md ? "microdescs" : "descs"); + log_debug(LD_DIR, "%d usable, %d present (%s%s).", + *num_usable, *num_present, + md ? "microdesc" : "desc", exit_only ? " exits" : "s"); } /** We just fetched a new set of descriptors. Compute how far through

1 0

[translation/vidalia_alpha_completed] Update translations for vidalia_alpha_completed
by translation＠torproject.org 16 Nov '12

16 Nov '12

commit 5f4049dc49037107cd4e60cf13317143f0dbe1ae Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 16 11:45:29 2012 +0000 Update translations for vidalia_alpha_completed --- es/vidalia_es.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index ecca2ed..c6adbba 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,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: 2012-11-14 19:48+0000\n" +"PO-Revision-Date: 2012-11-16 11:23+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -54,7 +54,7 @@ msgstr "Seleccione el Archivo de Configuración de Tor" msgctxt "AdvancedPage" msgid "File Not Found" -msgstr "Archivo No Encontrado" +msgstr "Archivo no encontrado" msgctxt "AdvancedPage" msgid "%1 does not exist. Would you like to create it?"

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 16 Nov '12

16 Nov '12

commit 8d0ec65fd240facf282f9891ddfd003a68b8cec6 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 16 11:45:24 2012 +0000 Update translations for vidalia_alpha --- es/vidalia_es.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index ecca2ed..c6adbba 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,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: 2012-11-14 19:48+0000\n" +"PO-Revision-Date: 2012-11-16 11:23+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -54,7 +54,7 @@ msgstr "Seleccione el Archivo de Configuración de Tor" msgctxt "AdvancedPage" msgid "File Not Found" -msgstr "Archivo No Encontrado" +msgstr "Archivo no encontrado" msgctxt "AdvancedPage" msgid "%1 does not exist. Would you like to create it?"

1 0

[ooni-probe/master] Tells pip to install scapy from the website
by art＠torproject.org 16 Nov '12

16 Nov '12

commit 8d09d4fb3b926a834029729031c44576328d17dd Author: Flavio Amieiro <amieiro.flavio(a)gmail.com> Date: Thu Nov 15 14:33:53 2012 -0200 Tells pip to install scapy from the website --- oonib/requirements.txt | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/oonib/requirements.txt b/oonib/requirements.txt index f9d7541..c94ae08 100644 --- a/oonib/requirements.txt +++ b/oonib/requirements.txt @@ -14,7 +14,7 @@ numpy==1.6.2 pyOpenSSL==0.13 pygeoip==0.2.5 repoze.sphinx.autointerface==0.7.1 -scapy==2.1.0 +https://hg.secdev.org/scapy/archive/tip.zip#egg=scapy storm==0.19 transaction==1.3.0 txtorcon==0.7 diff --git a/requirements.txt b/requirements.txt index e9a7bfc..33ecf44 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,7 +11,7 @@ ipaddr>=2.1.10 pyOpenSSL>=0.13 pygeoip>=0.2.5 repoze.sphinx.autointerface>=0.7.1 -scapy>=2.1.0 +https://hg.secdev.org/scapy/archive/tip.zip#egg=scapy storm>=0.19 transaction>=1.3.0 txtorcon>=0.6

1 0