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

[tor/master] Fix whitespace in parse_client_port_config()
by nickm＠torproject.org 10 Sep '11

10 Sep '11

commit 087e0569c3ca87bd2f851fd9126e100dd18da755 Author: Fabian Keil <fk(a)fabiankeil.de> Date: Mon Sep 5 21:35:15 2011 +0200 Fix whitespace in parse_client_port_config() --- src/or/config.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index afcea1f..684875d 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4980,7 +4980,7 @@ parse_client_port_config(smartlist_t *out, /* FooListenAddress is deprecated; let's make it work like it used to work, * though. */ if (listenaddrs) { - int mainport = defaultport; + int mainport = defaultport; if (ports && ports->next) { log_warn(LD_CONFIG, "%sListenAddress can't be used when there are "

1 0

[tor/master] Stop parse_client_port_config() from misinterpreting FooListenAddress and FooPort in legacy syntax
by nickm＠torproject.org 10 Sep '11

10 Sep '11

commit c6f6b567e0547968c474afd47d56cc03953e0f03 Author: Fabian Keil <fk(a)fabiankeil.de> Date: Sat Sep 10 12:33:23 2011 +0200 Stop parse_client_port_config() from misinterpreting FooListenAddress and FooPort in legacy syntax Previously the FooPort was ignored and the default used instead, causing Tor to bind to the wrong port if FooPort and the default port don't match or the CONN_TYPE_FOO_LISTENER has no default port. Fixes #3936. --- src/or/config.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 684875d..ac7c6ff 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -5019,7 +5019,7 @@ parse_client_port_config(smartlist_t *out, if (out) { port_cfg_t *cfg = tor_malloc_zero(sizeof(port_cfg_t)); cfg->type = listener_type; - cfg->port = port ? port : defaultport; + cfg->port = port ? port : mainport; tor_addr_copy(&cfg->addr, &addr); cfg->session_group = SESSION_GROUP_UNSET; cfg->isolation_flags = ISO_DEFAULT;

1 0

[tor/master] Changes file for bug3936 changes
by nickm＠torproject.org 10 Sep '11

10 Sep '11

commit a8838a86fe97b95afc075596339302ae8e0948be Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Sep 10 17:51:38 2011 -0400 Changes file for bug3936 changes --- changes/bug3936 | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/changes/bug3936 b/changes/bug3936 new file mode 100644 index 0000000..55b13c0 --- /dev/null +++ b/changes/bug3936 @@ -0,0 +1,5 @@ + o Major bugfixes: + - Fix a bug where the SocksPort option (for example) would get + ignored and replaced by the default if a SocksListenAddress option + was set. Bugfix on 0.2.3.3-alpha; fixes bug 3936. Fix by Fabian Keil. +

1 0

[tor/master] Fix log message typo.
by nickm＠torproject.org 10 Sep '11

10 Sep '11

commit c621e528833aaf871b81d21afa7495f84cbdd66b Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sat Sep 10 16:15:52 2011 -0400 Fix log message typo. --- changes/typo-fix-ohkah8Ah | 9 +++++++++ src/or/rendservice.c | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/changes/typo-fix-ohkah8Ah b/changes/typo-fix-ohkah8Ah new file mode 100644 index 0000000..9b4e5c0 --- /dev/null +++ b/changes/typo-fix-ohkah8Ah @@ -0,0 +1,9 @@ + * Minor bugfixes: + + - Clarify a log message specifying the characters permitted in + HiddenServiceAuthorizeClient client names. Previously, the log + message said that "[A-Za-z0-9+-_]" were permitted; that could + have given the impression that every ASCII character between "+" + and "_" was permitted. Now we say "[A-Za-z0-9+_-]". Bugfix on + 0.2.1.5-alpha. + diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 681c4b8..926f380 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -409,7 +409,7 @@ rend_config_services(or_options_t *options, int validate_only) if (strspn(client_name, REND_LEGAL_CLIENTNAME_CHARACTERS) != len) { log_warn(LD_CONFIG, "HiddenServiceAuthorizeClient contains an " "illegal client name: '%s'. Valid " - "characters are [A-Za-z0-9+-_].", + "characters are [A-Za-z0-9+_-].", client_name); SMARTLIST_FOREACH(clients, char *, cp, tor_free(cp)); smartlist_free(clients);

1 0

[tor/master] Merge remote-tracking branch 'rransom-tor/typo-fix-ohkah8Ah'
by nickm＠torproject.org 10 Sep '11

10 Sep '11

commit 35f9be7d044f17d0f7fc17a35eaf6f93df2ec34f Merge: ae2856b c621e52 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Sep 10 17:45:27 2011 -0400 Merge remote-tracking branch 'rransom-tor/typo-fix-ohkah8Ah' changes/typo-fix-ohkah8Ah | 9 +++++++++ src/or/rendservice.c | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-)

1 0

r25062: {} we do not need ar_SA, so merge with ar (translation/trunk/projects/website/po)
by Runa Sandvik 10 Sep '11

10 Sep '11

Author: runa Date: 2011-09-10 16:59:02 +0000 (Sat, 10 Sep 2011) New Revision: 25062 Removed: translation/trunk/projects/website/po/ar_SA/ Log: we do not need ar_SA, so merge with ar

1 0

r25061: {website} we do not need ar-se (website/trunk/include)
by Runa Sandvik 10 Sep '11

10 Sep '11

Author: runa Date: 2011-09-10 16:54:41 +0000 (Sat, 10 Sep 2011) New Revision: 25061 Modified: website/trunk/include/perl-globals.wmi Log: we do not need ar-se Modified: website/trunk/include/perl-globals.wmi =================================================================== --- website/trunk/include/perl-globals.wmi 2011-09-10 16:53:44 UTC (rev 25060) +++ website/trunk/include/perl-globals.wmi 2011-09-10 16:54:41 UTC (rev 25061) @@ -2,10 +2,9 @@ <: # Change both. The array is ordered (for pages like translation status, order of flags, etc). - my @LANGUAGES = qw{ar ar-se bms cy da de en es et fa fi fr hu id it ja ko nl no pl pt pt-br ru se tr vn zh-cn}; + my @LANGUAGES = qw{ar bms cy da de en es et fa fi fr hu id it ja ko nl no pl pt pt-br ru se tr vn zh-cn}; my %LANGUAGES = ( 'ar' => "عربية (Arabiya)", - 'ar-se' => "Arabic (Saudi Arabia)", 'bms' => "Burmese", 'cy' => "Welsh", 'da' => "Danish",

1 0

r25060: {website} we do not need ar-se (website/trunk)
by Runa Sandvik 10 Sep '11

10 Sep '11

Author: runa Date: 2011-09-10 16:53:44 +0000 (Sat, 10 Sep 2011) New Revision: 25060 Modified: website/trunk/Makefile.common Log: we do not need ar-se Modified: website/trunk/Makefile.common =================================================================== --- website/trunk/Makefile.common 2011-09-10 15:27:11 UTC (rev 25059) +++ website/trunk/Makefile.common 2011-09-10 16:53:44 UTC (rev 25060) @@ -18,7 +18,7 @@ -D STABLETAG=$(STABLETAG) #LANGS=ar bms de en es et fa it fi fr ja ko nl no pl pt ru se tr zh-cn -LANGS=ar ar-se bms cy da de en es et fa fi fr hu id it ja ko nl no pl pt pt-br ru se tr vn zh-cn +LANGS=ar bms cy da de en es et fa fi fr hu id it ja ko nl no pl pt pt-br ru se tr vn zh-cn WMLFILES=$(wildcard $(patsubst %, %/*.wml, $(LANGS))) WMIFILES=$(wildcard $(patsubst %, %/*.wmi, $(LANGS)) $(WMLBASE)/include/*.wmi ) @@ -35,9 +35,6 @@ %.html.ar: ar/%.wml en/%.wml lang=`dirname $<` && wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $@ -%.html.ar-se: ar-se/%.wml en/%.wml - lang=`dirname $<` && wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $@ - %.html.bms: bms/%.wml en/%.wml lang=`dirname $<` && wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $@ @@ -127,13 +124,6 @@ wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $$OUT --depend | tee $$tmpfile > $@ && \ sed -e s',$^[^ ]*$:,.deps/\1.d:,' < $$tmpfile >> $@ && \ rm -f $$tmpfile -.deps/%.html.ar-se.d: ar-se/%.wml .deps/.stamp - tmpfile=`mktemp -t tmp.XXXXXXX` \ - lang=`dirname $<` && \ - OUT=`echo $@ | sed -e 's,\.deps/$.*$\.d$$,\1,'` && \ - wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $$OUT --depend | tee $$tmpfile > $@ && \ - sed -e s',$^[^ ]*$:,.deps/\1.d:,' < $$tmpfile >> $@ && \ - rm -f $$tmpfile .deps/%.html.bms.d: bms/%.wml .deps/.stamp tmpfile=`mktemp -t tmp.XXXXXXX` \ lang=`dirname $<` && \

1 0

r25059: {website} update tbbs to 2.2.32-4 (website/trunk/include)
by Erinn Clark 10 Sep '11

10 Sep '11

Author: erinn Date: 2011-09-10 15:27:11 +0000 (Sat, 10 Sep 2011) New Revision: 25059 Modified: website/trunk/include/versions.wmi Log: update tbbs to 2.2.32-4 Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-09-10 11:43:39 UTC (rev 25058) +++ website/trunk/include/versions.wmi 2011-09-10 15:27:11 UTC (rev 25059) @@ -23,7 +23,7 @@ <define-tag version-osx-ppc-stable whitespace=delete>0.2.2.32</define-tag> <define-tag version-osx-ppc-alpha whitespace=delete>0.2.2.32</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>2.2.32-3</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>2.2.32-4</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.2.32</define-tag> <define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.14-stable, zlib-1.2.5, openssl-1.0.0d</define-tag> <define-tag version-torbrowser-firefox whitespace=delete>6.0.2</define-tag> @@ -33,15 +33,15 @@ <define-tag version-torbrowser-vidalia whitespace=delete>0.2.14</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.2.32-3</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.32-3</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.2.32-4</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.32-4</define-tag> <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.32</define-tag> <define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.14, zlib-1.2.5, openssl-0.9.8p</define-tag> <define-tag version-gnu-torbrowser-firefox whitespace=delete>6.0.2</define-tag> <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.4.2</define-tag> <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.14</define-tag> -<define-tag version-torbrowserbundleosx whitespace=delete>2.2.32-3</define-tag> +<define-tag version-torbrowserbundleosx whitespace=delete>2.2.32-4</define-tag> <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.32</define-tag> <define-tag version-osx-torbrowser-firefox whitespace=delete>6.0.2</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.4.2</define-tag>

1 0

r25058: {website} be expliciter about google cache for tor mirrors page (website/trunk/docs/en)
by Roger Dingledine 10 Sep '11

10 Sep '11

Author: arma Date: 2011-09-10 11:43:39 +0000 (Sat, 10 Sep 2011) New Revision: 25058 Modified: website/trunk/docs/en/faq.wml Log: be expliciter about google cache for tor mirrors page Modified: website/trunk/docs/en/faq.wml =================================================================== --- website/trunk/docs/en/faq.wml 2011-09-10 11:42:42 UTC (rev 25057) +++ website/trunk/docs/en/faq.wml 2011-09-10 11:43:39 UTC (rev 25058) @@ -655,7 +655,8 @@ Some government or corporate firewalls censor connections to Tor's website. In those cases, you have three options. First, get it from a friend — the <a href="<page projects/torbrowser>">Tor Browser -Bundle</a> fits nicely on a USB key. Second, find the google cache +Bundle</a> fits nicely on a USB key. Second, find the <a +href="https://encrypted.google.com/search?q=tor+mirrors">google cache</a> for the <a href="<page getinvolved/mirrors>">Tor mirrors</a> page and see if any of those copies of our website work for you. Third, you can download Tor via email: log in to your Gmail account and mail

1 0