- tor-commits - lists.torproject.org

[torspec/master] Merge remote-tracking branch 'atagar/ticket_6445'
by nickm＠torproject.org 23 Jul '12

23 Jul '12

commit 4bd7a767a89dab244d0731e906e5d2a3137737e7 Merge: ec9ca81 8b4a12a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 23 12:41:42 2012 -0400 Merge remote-tracking branch 'atagar/ticket_6445' version-spec.txt | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-)

1 0

[torspec/master] Remove incorrect definition of lexical order.
by nickm＠torproject.org 23 Jul '12

23 Jul '12

commit 460ab170f2a3ba941803f2665c24b0bcee2d9849 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 23 12:42:59 2012 -0400 Remove incorrect definition of lexical order. For the correct definition of lexical order, search for "lexical comparison". It's what your favorite language does for string comparison, unless your favorite language is something really esoteric. In short: If A and B are equal at every position, they are lexically equal. Otherwise, if A is a prefix of B, A precedes B. Otherwise, let i be the first position where A differs from B. If A[i] precedes B[i], A precedes B. --- version-spec.txt | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/version-spec.txt b/version-spec.txt index 54a2ac0..4a3dccf 100644 --- a/version-spec.txt +++ b/version-spec.txt @@ -33,8 +33,7 @@ release. If the tag ends with "-cvs" or "-dev", you're looking at a development snapshot that came after a given release. If we *do* encounter two versions that differ only by status tag, we compare them - lexically as ASCII byte strings (ie, reverse-alphabetically so 'b' comes - before 'a'). The STATUS_TAG can't contain whitespace. + lexically. The STATUS_TAG can't contain whitespace. The EXTRA_INFO is also purely informational, often containing information about the SCM commit this version came from. It is surrounded by parentheses

1 0

[tor/master] Better handling of server managed proxies when Tor is not a relay.
by nickm＠torproject.org 23 Jul '12

23 Jul '12

commit a1d060a68f62af3c9813f530eab70ce70d70fd6c Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Jul 18 20:01:02 2012 +0200 Better handling of server managed proxies when Tor is not a relay. --- changes/bug6274 | 3 +++ changes/bug6274_2 | 3 +++ src/or/config.c | 9 ++++++++- 3 files changed, 14 insertions(+), 1 deletions(-) diff --git a/changes/bug6274 b/changes/bug6274 new file mode 100644 index 0000000..ad1abcd --- /dev/null +++ b/changes/bug6274 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Ignore ServerTransportPlugin lines when Tor is not configured as + a relay. Fixes bug 6274; bugfix on 0.2.3.6-alpha. diff --git a/changes/bug6274_2 b/changes/bug6274_2 new file mode 100644 index 0000000..89576f9 --- /dev/null +++ b/changes/bug6274_2 @@ -0,0 +1,3 @@ + o Minor features: + - Terminate active server managed proxies if Tor stops being a + relay. Addresses parts of bug 6274; bugfix on 0.2.3.6-alpha. diff --git a/src/or/config.c b/src/or/config.c index d90e0fc..07da2da 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1464,7 +1464,7 @@ options_act(const or_options_t *old_options) } } - if (options->ServerTransportPlugin) { + if (options->ServerTransportPlugin && server_mode(options)) { for (cl = options->ServerTransportPlugin; cl; cl = cl->next) { if (parse_server_transport_line(cl->value, 0)<0) { log_warn(LD_BUG, @@ -4019,6 +4019,13 @@ options_validate(or_options_t *old_options, or_options_t *options, REJECT("Server transport line did not parse. See logs for details."); } + if (options->ServerTransportPlugin && !server_mode(options)) { + log_notice(LD_GENERAL, "Tor is not configured as a relay but you specified" + " a ServerTransportPlugin line (%s). The ServerTransportPlugin " + "line will be ignored.", + esc_for_log(options->ServerTransportPlugin->value)); + } + if (options->ConstrainedSockets) { /* If the user wants to constrain socket buffer use, make sure the desired * limit is between MIN|MAX_TCPSOCK_BUFFER in k increments. */

1 0

[tor/master] Merge remote-tracking branch 'asn/bug6274_take3' into maint-0.2.3
by nickm＠torproject.org 23 Jul '12

23 Jul '12

commit 692005b38d3607f53d9fb605a6b4584553417ad9 Merge: 6cf8e38 a1d060a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 23 12:35:23 2012 -0400 Merge remote-tracking branch 'asn/bug6274_take3' into maint-0.2.3 changes/bug6274 | 3 +++ changes/bug6274_2 | 3 +++ src/or/config.c | 9 ++++++++- 3 files changed, 14 insertions(+), 1 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'
by nickm＠torproject.org 23 Jul '12

23 Jul '12

commit 20b625a0fdcf334f448bc5a49fee0d78137ed231 Merge: 952f562 692005b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 23 12:36:04 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' changes/bug6274 | 3 +++ changes/bug6274_2 | 3 +++ src/or/config.c | 9 ++++++++- 3 files changed, 14 insertions(+), 1 deletions(-)

1 0

[tor/maint-0.2.3] Better handling of server managed proxies when Tor is not a relay.
by nickm＠torproject.org 23 Jul '12

23 Jul '12

commit a1d060a68f62af3c9813f530eab70ce70d70fd6c Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Jul 18 20:01:02 2012 +0200 Better handling of server managed proxies when Tor is not a relay. --- changes/bug6274 | 3 +++ changes/bug6274_2 | 3 +++ src/or/config.c | 9 ++++++++- 3 files changed, 14 insertions(+), 1 deletions(-) diff --git a/changes/bug6274 b/changes/bug6274 new file mode 100644 index 0000000..ad1abcd --- /dev/null +++ b/changes/bug6274 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Ignore ServerTransportPlugin lines when Tor is not configured as + a relay. Fixes bug 6274; bugfix on 0.2.3.6-alpha. diff --git a/changes/bug6274_2 b/changes/bug6274_2 new file mode 100644 index 0000000..89576f9 --- /dev/null +++ b/changes/bug6274_2 @@ -0,0 +1,3 @@ + o Minor features: + - Terminate active server managed proxies if Tor stops being a + relay. Addresses parts of bug 6274; bugfix on 0.2.3.6-alpha. diff --git a/src/or/config.c b/src/or/config.c index d90e0fc..07da2da 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1464,7 +1464,7 @@ options_act(const or_options_t *old_options) } } - if (options->ServerTransportPlugin) { + if (options->ServerTransportPlugin && server_mode(options)) { for (cl = options->ServerTransportPlugin; cl; cl = cl->next) { if (parse_server_transport_line(cl->value, 0)<0) { log_warn(LD_BUG, @@ -4019,6 +4019,13 @@ options_validate(or_options_t *old_options, or_options_t *options, REJECT("Server transport line did not parse. See logs for details."); } + if (options->ServerTransportPlugin && !server_mode(options)) { + log_notice(LD_GENERAL, "Tor is not configured as a relay but you specified" + " a ServerTransportPlugin line (%s). The ServerTransportPlugin " + "line will be ignored.", + esc_for_log(options->ServerTransportPlugin->value)); + } + if (options->ConstrainedSockets) { /* If the user wants to constrain socket buffer use, make sure the desired * limit is between MIN|MAX_TCPSOCK_BUFFER in k increments. */

1 0

[tor/maint-0.2.3] Merge remote-tracking branch 'asn/bug6274_take3' into maint-0.2.3
by nickm＠torproject.org 23 Jul '12

23 Jul '12

commit 692005b38d3607f53d9fb605a6b4584553417ad9 Merge: 6cf8e38 a1d060a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 23 12:35:23 2012 -0400 Merge remote-tracking branch 'asn/bug6274_take3' into maint-0.2.3 changes/bug6274 | 3 +++ changes/bug6274_2 | 3 +++ src/or/config.c | 9 ++++++++- 3 files changed, 14 insertions(+), 1 deletions(-)

1 0

[tor/master] Clarify how to build asciidoc files using homebrew on Mac OS X
by nickm＠torproject.org 23 Jul '12

23 Jul '12

commit 5b853612fbc928e9477b06095838e76f37bce6fc Author: Steven Murdoch <Steven.Murdoch(a)cl.cam.ac.uk> Date: Fri Jul 20 14:29:20 2012 +0100 Clarify how to build asciidoc files using homebrew on Mac OS X --- doc/asciidoc-helper.sh | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/doc/asciidoc-helper.sh b/doc/asciidoc-helper.sh index 33e1360..dd420f7 100755 --- a/doc/asciidoc-helper.sh +++ b/doc/asciidoc-helper.sh @@ -54,7 +54,9 @@ You need a working asciidoc installed to be able to build the manpage. a2x is installed, but for some reason it isn't working. Sometimes This happens because required docbook support files are missing. Please install docbook-xsl, docbook-xml, and libxml2-utils (Debian) or -similar. +similar. If you use homebrew on Mac OS X, install the docbook formula +and add "export XML_CATALOG_FILES=/usr/local/etc/xml/catalog" to your +.bashrc Alternatively, to build without manpages, use the --disable-asciidoc argument when calling configure.

1 0

[tor/master] changes file for bug 6436.
by nickm＠torproject.org 23 Jul '12

23 Jul '12

commit 6cf8e38eca78bfb5d4fd38733deb5b358ac4fdea Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 20 09:50:19 2012 -0400 changes file for bug 6436. --- changes/bug6436 | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/changes/bug6436 b/changes/bug6436 new file mode 100644 index 0000000..2c163df --- /dev/null +++ b/changes/bug6436 @@ -0,0 +1,3 @@ + o Minor features: + - Provide a better error message about possible OSX Asciidoc failure + reasons. Fix for bug 6436.

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'
by nickm＠torproject.org 23 Jul '12

23 Jul '12

commit 952f562691bb0888331afae3bec47541c0531467 Merge: a4995d1 6cf8e38 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 23 12:31:24 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' changes/bug6436 | 3 +++ doc/asciidoc-helper.sh | 4 +++- 2 files changed, 6 insertions(+), 1 deletions(-)

1 0