September 2014 - tor-commits - lists.torproject.org

[flashproxy/master] Prevent setup.py scripts from downloading dependencies.
by dcf＠torproject.org 20 Sep '14

20 Sep '14

commit f9bf878eced66fe8d85f28133095affdc48633be Author: David Fifield <david(a)bamsoftware.com> Date: Fri Sep 19 20:53:36 2014 -0700 Prevent setup.py scripts from downloading dependencies. You can't just tell setuptools not to download things, so instead set the http_proxy and https_proxy environment variables to point to a local port. https://trac.torproject.org/projects/tor/ticket/10847 --- ChangeLog | 3 +++ setup-client-exe.py | 5 +++++ setup-common.py | 6 ++++++ 3 files changed, 14 insertions(+) diff --git a/ChangeLog b/ChangeLog index b778a38..27be914 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ + o Prevented setup.py scripts from automatically downloading + dependencies. Fixes bug 10847. + Changes in version 1.7 o Made the badge color reflect what's going on when it encounters a network error and tries to reconnect. Fixes bug 11400. diff --git a/setup-client-exe.py b/setup-client-exe.py index 62b9c87..2e0506f 100755 --- a/setup-client-exe.py +++ b/setup-client-exe.py @@ -4,6 +4,11 @@ from distutils.core import setup import os import py2exe +# Prevent setuptools from trying to download dependencies. +# https://trac.torproject.org/projects/tor/ticket/10847 +os.environ["http_proxy"] = "127.0.0.1:9" +os.environ["https_proxy"] = "127.0.0.1:9" + build_path = os.path.join(os.environ["PY2EXE_TMPDIR"], "build") dist_path = os.path.join(os.environ["PY2EXE_TMPDIR"], "dist") diff --git a/setup-common.py b/setup-common.py index ffe7c33..2780226 100755 --- a/setup-common.py +++ b/setup-common.py @@ -20,9 +20,15 @@ To build/install a self-contained binary distribution of flashproxy-client # # See discussion on #6810 for more details. +import os import subprocess import sys +# Prevent setuptools from trying to download dependencies. +# https://trac.torproject.org/projects/tor/ticket/10847 +os.environ["http_proxy"] = "127.0.0.1:9" +os.environ["https_proxy"] = "127.0.0.1:9" + from setuptools import setup, find_packages p = subprocess.Popen(["sh", "version.sh"], stdout=subprocess.PIPE)

1 0

[tor/release-0.2.5] fold in existing changes entry
by arma＠torproject.org 20 Sep '14

20 Sep '14

commit 22a82164b159ac157d133580bc06abdbd04f423a Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Sep 19 21:45:14 2014 -0400 fold in existing changes entry --- ChangeLog | 16 ++++++++++++++++ changes/bug13151-client | 13 ------------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 424f208..e334c85 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +Changes in version 0.2.5.8-rc - 2014-09-2? + o Major bugfixes: + - Clients now send the correct address for their chosen rendezvous + point when trying to access a hidden service. They used to send + the wrong address, which would still work some of the time because + they also sent the identity digest of the rendezvous point, and if + the hidden service happened to try connecting to the rendezvous + point from a relay that already had a connection open to it, + the relay would reuse that connection. Now connections to hidden + services should be more robust and faster. Also, this bug meant + that clients were leaking to the hidden service whether they were + on a little-endian (common) or big-endian (rare) system, which for + some users might have reduced their anonymity. Fixes bug 13151; + bugfix on 0.2.1.5-alpha. + + Changes in version 0.2.5.7-rc - 2014-09-11 Tor 0.2.5.7-rc fixes several regressions from earlier in the 0.2.5.x release series, and some long-standing bugs related to ORPort reachability diff --git a/changes/bug13151-client b/changes/bug13151-client deleted file mode 100644 index 1218dfd..0000000 --- a/changes/bug13151-client +++ /dev/null @@ -1,13 +0,0 @@ - o Major bugfixes: - - Clients now send the correct address for their chosen rendezvous - point when trying to access a hidden service. They used to send - the wrong address, which would still work some of the time because - they also sent the identity digest of the rendezvous point, and if - the hidden service happened to try connecting to the rendezvous - point from a relay that already had a connection open to it, - the relay would reuse that connection. Now connections to hidden - services should be more robust and faster. Also, this bug meant - that clients were leaking to the hidden service whether they were - on a little-endian (common) or big-endian (rare) system, which for - some users might have reduced their anonymity. Fixes bug 13151; - bugfix on 0.2.1.5-alpha.

1 0

[tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5
by arma＠torproject.org 20 Sep '14

20 Sep '14

commit 0b004ba5c0c00b9d367b5a1e305f9e4e9adc65b6 Merge: 396ac67 be0e262 Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Sep 19 21:44:23 2014 -0400 Merge branch 'maint-0.2.5' into release-0.2.5 changes/bug13151-client | 13 +++++++++++++ src/or/rendclient.c | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-)

1 0

[tor/release-0.2.5] Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
by arma＠torproject.org 20 Sep '14

20 Sep '14

commit be0e26272b3e795b902394acc9b66642fcdc1f21 Merge: 550c033 0c3b365 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 16 11:10:02 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5 changes/bug13151-client | 13 +++++++++++++ src/or/rendclient.c | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-)

1 0

[tor/release-0.2.5] clients now send correct address for rendezvous point
by arma＠torproject.org 20 Sep '14

20 Sep '14

commit 0c3b3650aa831183c76b044466e89eaee36d5684 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Sep 13 21:49:37 2014 -0400 clients now send correct address for rendezvous point Clients now send the correct address for their chosen rendezvous point when trying to access a hidden service. They used to send the wrong address, which would still work some of the time because they also sent the identity digest of the rendezvous point, and if the hidden service happened to try connecting to the rendezvous point from a relay that already had a connection open to it, the relay would reuse that connection. Now connections to hidden services should be more robust and faster. Also, this bug meant that clients were leaking to the hidden service whether they were on a little-endian (common) or big-endian (rare) system, which for some users might have reduced their anonymity. Fixes bug 13151; bugfix on 0.2.1.5-alpha. --- changes/bug13151-client | 13 +++++++++++++ src/or/rendclient.c | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/changes/bug13151-client b/changes/bug13151-client new file mode 100644 index 0000000..1218dfd --- /dev/null +++ b/changes/bug13151-client @@ -0,0 +1,13 @@ + o Major bugfixes: + - Clients now send the correct address for their chosen rendezvous + point when trying to access a hidden service. They used to send + the wrong address, which would still work some of the time because + they also sent the identity digest of the rendezvous point, and if + the hidden service happened to try connecting to the rendezvous + point from a relay that already had a connection open to it, + the relay would reuse that connection. Now connections to hidden + services should be more robust and faster. Also, this bug meant + that clients were leaking to the hidden service whether they were + on a little-endian (common) or big-endian (rare) system, which for + some users might have reduced their anonymity. Fixes bug 13151; + bugfix on 0.2.1.5-alpha. diff --git a/src/or/rendclient.c b/src/or/rendclient.c index bb4bd9b..7abbfd6 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -269,7 +269,7 @@ rend_client_send_introduction(origin_circuit_t *introcirc, extend_info_t *extend_info = rendcirc->build_state->chosen_exit; int klen; /* nul pads */ - set_uint32(tmp+v3_shift+1, tor_addr_to_ipv4h(&extend_info->addr)); + set_uint32(tmp+v3_shift+1, tor_addr_to_ipv4n(&extend_info->addr)); set_uint16(tmp+v3_shift+5, htons(extend_info->port)); memcpy(tmp+v3_shift+7, extend_info->identity_digest, DIGEST_LEN); klen = crypto_pk_asn1_encode(extend_info->onion_key,

1 0

[stem/master] Updating gabelmoo's address
by atagar＠torproject.org 19 Sep '14

19 Sep '14

commit 1435e76f0446af060c1fb963b3b370d093fde953 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Sep 19 09:35:36 2014 -0700 Updating gabelmoo's address Changing it as per... https://lists.torproject.org/pipermail/tor-talk/2014-September/034898.html Looks like the old address works for the moment, though. --- stem/descriptor/remote.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py index eccf2d1..4f44608 100644 --- a/stem/descriptor/remote.py +++ b/stem/descriptor/remote.py @@ -706,7 +706,7 @@ DIRECTORY_AUTHORITIES = { ), 'gabelmoo': DirectoryAuthority( nickname = 'gabelmoo', - address = '212.112.245.170', + address = '131.188.40.189', or_port = 443, dir_port = 80, fingerprint = 'F2044413DAC2E02E3D6BCF4735A19BCA1DE97281',

1 0

[stem/master] Adding join() function to the str_tools module
by atagar＠torproject.org 19 Sep '14

19 Sep '14

commit 42f02bf3371f0b45f04ed47001f05a2d4effb7f7 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Sep 17 10:10:34 2014 -0700 Adding join() function to the str_tools module Function to greatly simplify 'gimme this string joined just up to a given point'. Basic test coverage via its doctests. --- docs/change_log.rst | 1 + stem/util/str_tools.py | 39 +++++++++++++++++++++++++++++++++++++++ test/unit/doctest.py | 1 + 3 files changed, 41 insertions(+) diff --git a/docs/change_log.rst b/docs/change_log.rst index ff5b60d..c5867e4 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -58,6 +58,7 @@ The following are only available within Stem's `git repository * Added support for directories to :func:`stem.util.conf.Config.load`. * Changed :func:`stem.util.conf.uses_settings` to only provide a 'config' keyword arument if the decorated function would accept it. * Added :func:`stem.util.str_tools.crop` + * Added :func:`stem.util.str_tools.join` * Added :func:`stem.util.proc.file_descriptors_used` * Dropped the 'get_*' prefix from most function names. Old names will still work, but are a deprecated alias. diff --git a/stem/util/str_tools.py b/stem/util/str_tools.py index 16681d5..d669753 100644 --- a/stem/util/str_tools.py +++ b/stem/util/str_tools.py @@ -13,6 +13,7 @@ Toolkit for various string activity. :: crop - shortens string to a given length + join - joins a series of strings up to a given length size_label - human readable label for a number of bytes time_label - human readable label for a number of seconds @@ -257,6 +258,44 @@ def crop(msg, size, min_word_length = 4, min_crop = 0, ending = Ending.ELLIPSE, return (return_msg, remainder) if get_remainder else return_msg +def join(entries, joiner = ' ', size = None): + """ + Joins a series of strings similar to str.join(), but only up to a given size. + This returns an empty string if none of the entries will fit. For example... + + >>> join(['This', 'is', 'a', 'looooong', 'message'], size = 18) + 'This is a looooong' + + >>> join(['This', 'is', 'a', 'looooong', 'message'], size = 17) + 'This is a' + + >>> join(['This', 'is', 'a', 'looooong', 'message'], size = 2) + '' + + :param list entries: strings to be joined + :param str joiner: strings to join the entries with + :param int size: maximum length the result can be, there's no length + limitation if **None** + + :returns: **str** of the joined entries up to the given length + """ + + if size is None: + return joiner.join(entries) + + result = '' + + for entry in entries: + new_result = joiner.join((result, entry)) if result else entry + + if len(new_result) > size: + break + else: + result = new_result + + return result + + def size_label(byte_count, decimal = 0, is_long = False, is_bytes = True): """ Converts a number of bytes into a human readable label in its most diff --git a/test/unit/doctest.py b/test/unit/doctest.py index e3e53d8..090b273 100644 --- a/test/unit/doctest.py +++ b/test/unit/doctest.py @@ -60,6 +60,7 @@ class TestDocumentation(unittest.TestCase): args['globs'] = { '_to_camel_case': stem.util.str_tools._to_camel_case, 'crop': stem.util.str_tools.crop, + 'join': stem.util.str_tools.join, 'size_label': stem.util.str_tools.size_label, 'time_label': stem.util.str_tools.time_label, 'time_labels': stem.util.str_tools.time_labels,

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 19 Sep '14

19 Sep '14

commit 3cdac761ae18b115b925e5de98a9752286ace116 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 19 15:15:11 2014 +0000 Update translations for torcheck_completed --- sr/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sr/torcheck.po b/sr/torcheck.po index e4fa78d..97f4bb4 100644 --- a/sr/torcheck.po +++ b/sr/torcheck.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-09-19 14:44+0000\n" +"PO-Revision-Date: 2014-09-19 14:52+0000\n" "Last-Translator: a <aiai_rodni(a)gmx.com>\n" "Language-Team: Serbian (http://www.transifex.com/projects/p/torproject/language/sr/)\n" "MIME-Version: 1.0\n"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 19 Sep '14

19 Sep '14

commit 225f80f3c76387dec1ec89c1fbd269a98f27b4ce Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 19 15:15:09 2014 +0000 Update translations for torcheck --- sr/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sr/torcheck.po b/sr/torcheck.po index e4fa78d..97f4bb4 100644 --- a/sr/torcheck.po +++ b/sr/torcheck.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-09-19 14:44+0000\n" +"PO-Revision-Date: 2014-09-19 14:52+0000\n" "Last-Translator: a <aiai_rodni(a)gmx.com>\n" "Language-Team: Serbian (http://www.transifex.com/projects/p/torproject/language/sr/)\n" "MIME-Version: 1.0\n"

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 19 Sep '14

19 Sep '14

commit 992787fcc51d4e066a54fb51965b01c86319ac90 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 19 14:45:14 2014 +0000 Update translations for torcheck_completed --- sr/torcheck.po | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/sr/torcheck.po b/sr/torcheck.po index f19715b..e4fa78d 100644 --- a/sr/torcheck.po +++ b/sr/torcheck.po @@ -2,14 +2,15 @@ # Copyright (C) 2008-2013 The Tor Project, Inc # # Translators: +# a <aiai_rodni(a)gmx.com>, 2014 # mahavidyas <mahavidyas(a)gmail.com>, 2012 # tentaclewarrior <exterminator996(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-07-09 17:40+0000\n" -"Last-Translator: tentaclewarrior <exterminator996(a)gmail.com>\n" +"PO-Revision-Date: 2014-09-19 14:44+0000\n" +"Last-Translator: a <aiai_rodni(a)gmx.com>\n" "Language-Team: Serbian (http://www.transifex.com/projects/p/torproject/language/sr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,7 +20,7 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" msgid "Congratulations. This browser is configured to use Tor." -msgstr "Cestitamo. Ovaj browser je podesen da koristi Tor." +msgstr "Честитамо! Овај прегледач је подешен да користи Tor." msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " @@ -33,7 +34,7 @@ msgstr "Доступна је безбедносна надоградња за T msgid "" "<a href=\"https://www.torproject.org/download/download-easy.html\">Click " "here to go to the download page</a>" -msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">Кликните овде да бисте посетили страницу за скидање</a>" +msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">Кликните овде да бисте посетили страницу за преузимање</a>" msgid "Sorry. You are not using Tor." msgstr "Жао нам је, али не користите Tor." @@ -43,7 +44,7 @@ msgid "" "href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a" " href=\"https://www.torproject.org/docs/faq#DoesntWork\">instructions for " "configuring your Tor client</a>." -msgstr "Ако покушавате да користите Tor клијент, молимо вас да погледате <a href=\"https://www.torproject.org/\">Tor вебсајт</a> и посебно <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">инструкције за подешавање Tor клијента</a>." +msgstr "Ако покушавате да користите Tor клијент, молимо вас да погледате <a href=\"https://www.torproject.org/\">Tor вебсајт</a> као и <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">инструкције за подешавање Tor клијента</a>." msgid "Sorry, your query failed or an unexpected response was received." msgstr "Жао нам је, али дошло је до неочекиване грешке." @@ -57,42 +58,42 @@ msgid "Your IP address appears to be: " msgstr "Изгледа да је Ваша IP адреса:" msgid "Are you using Tor?" -msgstr "Da li koristite Tor?" +msgstr "Да ли користите Tor?" msgid "This page is also available in the following languages:" -msgstr "Ova stranica je takodje dostupna na sledecim jezicima:" +msgstr "Ова страница је такође доступна на следећим језицима:" msgid "For more information about this exit relay, see:" -msgstr "Za vise informacija o ovom izlaznom relay-u pogledajte:" +msgstr "За више информација о овом излазном релеју погледајте:" msgid "" "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, " "development, and education of online anonymity and privacy." -msgstr "Tor Projekat je američka 501(c)(3) ne profitna organizacija posvećena istraživanju, razvoju i edukaciji o online anonimnosti i privatnosti." +msgstr "Tor Пројекат је америчка 501(ц)(3) непрофитна организација посвећена истраживању, развоју и едукацији о анонимности и приватности." msgid "Learn More »" -msgstr "Saznajte vise&cpp:" +msgstr "Сазнајте више&cpp:" msgid "Go" -msgstr "Kreni" +msgstr "Крени" msgid "Short User Manual" -msgstr "Kratko korisnicko uputstvo" +msgstr "Кратко корисничко упутство" msgid "Donate to Support Tor" -msgstr "Donirajte da podrzite Tor" +msgstr "Донирајте да подржите Tor" msgid "Tor Q&A Site" -msgstr "Tor sajt za pitanja i odgovore" +msgstr "Tor сајт за питања и одговоре" msgid "Volunteer" -msgstr "Volontirajte" +msgstr "Волонтирајте" msgid "JavaScript is enabled." -msgstr "JavaScript je ukljucen" +msgstr "JavaScript је укључен." msgid "JavaScript is disabled." -msgstr "JavaScript je iskljucen" +msgstr "JavaScript је искључен." msgid "However, it does not appear to be the Tor Browser Bundle." -msgstr "Medjutim izgleda da ovo nije Tor Browser paket." +msgstr "Међутим, изгледа да ово није Tor Browser пакет."

1 0