April 2019 - tor-commits - lists.torproject.org

[tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/892' into maint-0.4.0
by teor＠torproject.org 09 Apr '19

09 Apr '19

commit 92e8bdf296c042ad386b2acb764bb4f4cfd2de0f Merge: 61e6b217c 5613968d5 Author: teor <teor(a)torproject.org> Date: Tue Apr 9 11:35:41 2019 +1000 Merge remote-tracking branch 'tor-github/pr/892' into maint-0.4.0 changes/bug28614_better_logging | 6 ++++++ src/feature/nodelist/networkstatus.c | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-)

1 0

[tor/master] Fix checkIncludes warning about "unusual pattern in src/ext/timeouts/"
by teor＠torproject.org 09 Apr '19

09 Apr '19

commit c66df27c906b1140ea33f4e5d5ab9486594ada9d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 28 16:35:24 2019 -0400 Fix checkIncludes warning about "unusual pattern in src/ext/timeouts/" Closes ticket 28806. --- src/ext/timeouts/.may_include | 5 ++--- src/ext/timeouts/test-timeout.c | 2 +- src/ext/timeouts/timeout.c | 6 +++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/ext/timeouts/.may_include b/src/ext/timeouts/.may_include index 42f44befd..92c711655 100644 --- a/src/ext/timeouts/.may_include +++ b/src/ext/timeouts/.may_include @@ -1,6 +1,5 @@ orconfig.h ext/tor_queue.h -timeout-bitops.c -timeout-debug.h -timeout.h +ext/timeouts/*.h +ext/timeouts/timeout-bitops.c diff --git a/src/ext/timeouts/test-timeout.c b/src/ext/timeouts/test-timeout.c index 807712937..52d2e31e0 100644 --- a/src/ext/timeouts/test-timeout.c +++ b/src/ext/timeouts/test-timeout.c @@ -4,7 +4,7 @@ #include <assert.h> #include <limits.h> -#include "timeout.h" +#include "ext/timeouts/timeout.h" #define THE_END_OF_TIME ((timeout_t)-1) diff --git a/src/ext/timeouts/timeout.c b/src/ext/timeouts/timeout.c index 07d06772c..79fcc168e 100644 --- a/src/ext/timeouts/timeout.c +++ b/src/ext/timeouts/timeout.c @@ -40,14 +40,14 @@ #include "ext/tor_queue.h" /* TAILQ(3) */ -#include "timeout.h" +#include "ext/timeouts/timeout.h" #ifndef TIMEOUT_DEBUG #define TIMEOUT_DEBUG 0 #endif #if TIMEOUT_DEBUG - 0 -#include "timeout-debug.h" +#include "ext/timeouts/timeout-debug.h" #endif #ifdef TIMEOUT_DISABLE_RELATIVE_ACCESS @@ -141,7 +141,7 @@ #define WHEEL_MASK (WHEEL_LEN - 1) #define TIMEOUT_MAX ((TIMEOUT_C(1) << (WHEEL_BIT * WHEEL_NUM)) - 1) -#include "timeout-bitops.c" +#include "ext/timeouts/timeout-bitops.c" #if WHEEL_BIT == 6 #define ctz(n) ctz64(n)

1 0

[tor/master] Improve logging for 28614.
by teor＠torproject.org 09 Apr '19

09 Apr '19

commit 5613968d57cb07cc5a66e97c58bd39c22b86a50a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 3 14:30:56 2019 -0400 Improve logging for 28614. When we fixed 28614, our answer was "if we failed to load the consensus on windows and it had a CRLF, retry it." But we logged the failure at "warn", and we only logged the retry at "info". Now we log the retry at "notice", with more useful information. Fixes bug 30004. --- changes/bug28614_better_logging | 6 ++++++ src/feature/nodelist/networkstatus.c | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/changes/bug28614_better_logging b/changes/bug28614_better_logging new file mode 100644 index 000000000..26d19c3c1 --- /dev/null +++ b/changes/bug28614_better_logging @@ -0,0 +1,6 @@ + o Minor bugfixes (logging): + - On Windows, when errors cause us to reload a consensus from disk, tell + the user that we are retrying at log level "notice". Previously we only + logged this information at "info", which was confusing because the + errors themselves were logged at "warning". Improves previous fix for + 28614. Fixes bug 30004; bugfix on 0.4.0.2-alpha. diff --git a/src/feature/nodelist/networkstatus.c b/src/feature/nodelist/networkstatus.c index 023115978..a988f700f 100644 --- a/src/feature/nodelist/networkstatus.c +++ b/src/feature/nodelist/networkstatus.c @@ -1761,8 +1761,11 @@ reload_consensus_from_file(const char *fname, flavor, flags, source_dir); #ifdef _WIN32 if (rv < 0 && tor_memstr(map->data, map->size, "\r\n")) { - log_info(LD_GENERAL, "Found CRLF in consensus file %s; falling back to " - "read_file_to_string.", escaped(fname)); + log_notice(LD_GENERAL, "Looks like the above failures are probably " + "because of a CRLF in consensus file %s; falling back to " + "read_file_to_string. Nothing to worry about: this file " + "was probably saved by an earlier version of Tor.", + escaped(fname)); char *content = read_file_to_str(fname, RFTS_IGNORE_MISSING, NULL); rv = networkstatus_set_current_consensus(content, strlen(content), flavor, flags, source_dir);

1 0

[tor/master] manpage: Clarify that Tor does stream isolation between *Port listeners by default
by teor＠torproject.org 09 Apr '19

09 Apr '19

commit 61e6b217c5c83bc49e888f594f931c00c3e9b971 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Mon Mar 25 15:40:46 2019 +0200 manpage: Clarify that Tor does stream isolation between *Port listeners by default cherry-pick of tor-github/pr/841 to maint-0.4.0. --- changes/doc29121 | 3 +++ doc/tor.1.txt | 14 +++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/changes/doc29121 b/changes/doc29121 new file mode 100644 index 000000000..dd31cc9c7 --- /dev/null +++ b/changes/doc29121 @@ -0,0 +1,3 @@ + o Documentation: + - Clarify that Tor performs stream isolation between *Port listeners by + default. Resolves issue 29121. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index ea9942a28..c2df7687f 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1230,6 +1230,8 @@ The following options are useful only for clients (that is, if information to anybody watching your network, and allow anybody to use your computer as an open proxy. + + + If multiple entries of this option are present in your configuration + file, Tor will perform stream isolation between listeners by default. The _isolation flags_ arguments give Tor rules for which streams received on this SocksPort are allowed to share circuits with one another. Recognized isolation flags are: @@ -1472,14 +1474,18 @@ The following options are useful only for clients (that is, if protocol instead of SOCKS. Set this to 0 if you don't want to allow "HTTP CONNECT" connections. Set the port to "auto" to have Tor pick a port for you. This directive can be - specified multiple times to bind to multiple addresses/ports. See + specified multiple times to bind to multiple addresses/ports. If multiple + entries of this option are present in your configuration file, Tor will + perform stream isolation between listeners by default. See SOCKSPort for an explanation of isolation flags. (Default: 0) [[TransPort]] **TransPort** \['address':]__port__|**auto** [_isolation flags_]:: Open this port to listen for transparent proxy connections. Set this to 0 if you don't want to allow transparent proxy connections. Set the port to "auto" to have Tor pick a port for you. This directive can be - specified multiple times to bind to multiple addresses/ports. See + specified multiple times to bind to multiple addresses/ports. If multiple + entries of this option are present in your configuration file, Tor will + perform stream isolation between listeners by default. See SOCKSPort for an explanation of isolation flags. + + TransPort requires OS support for transparent proxies, such as BSDs' pf or @@ -1516,7 +1522,9 @@ The following options are useful only for clients (that is, if included in old versions of FreeBSD, etc) using the NATD protocol. Use 0 if you don't want to allow NATD connections. Set the port to "auto" to have Tor pick a port for you. This directive can be - specified multiple times to bind to multiple addresses/ports. See + specified multiple times to bind to multiple addresses/ports. If multiple + entries of this option are present in your configuration file, Tor will + perform stream isolation between listeners by default. See SocksPort for an explanation of isolation flags. + + This option is only for people who cannot use TransPort. (Default: 0)

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/892' into maint-0.4.0
by teor＠torproject.org 09 Apr '19

09 Apr '19

commit 92e8bdf296c042ad386b2acb764bb4f4cfd2de0f Merge: 61e6b217c 5613968d5 Author: teor <teor(a)torproject.org> Date: Tue Apr 9 11:35:41 2019 +1000 Merge remote-tracking branch 'tor-github/pr/892' into maint-0.4.0 changes/bug28614_better_logging | 6 ++++++ src/feature/nodelist/networkstatus.c | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/862'
by teor＠torproject.org 09 Apr '19

09 Apr '19

commit 2dab7a10780db1047bda4e18c2d308274744e806 Merge: 7741b21d0 283ee0ba0 Author: teor <teor(a)torproject.org> Date: Tue Apr 9 11:36:12 2019 +1000 Merge remote-tracking branch 'tor-github/pr/862' changes/bug29926 | 2 ++ doc/asciidoc-helper.sh | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.4.0'
by teor＠torproject.org 09 Apr '19

09 Apr '19

commit 3d45079c27b94f073442f80b203f9787857c2d01 Merge: e4692fad9 92e8bdf29 Author: teor <teor(a)torproject.org> Date: Tue Apr 9 11:36:59 2019 +1000 Merge branch 'maint-0.4.0' changes/bug28614_better_logging | 6 ++++++ changes/doc29121 | 3 +++ doc/tor.1.txt | 14 +++++++++++--- src/feature/nodelist/networkstatus.c | 7 +++++-- 4 files changed, 25 insertions(+), 5 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/866'
by teor＠torproject.org 09 Apr '19

09 Apr '19

commit e4692fad9680ffea938dd6024ceacfc1ba1edffa Merge: 2dab7a107 c66df27c9 Author: teor <teor(a)torproject.org> Date: Tue Apr 9 11:36:38 2019 +1000 Merge remote-tracking branch 'tor-github/pr/866' src/ext/timeouts/.may_include | 5 ++--- src/ext/timeouts/test-timeout.c | 2 +- src/ext/timeouts/timeout.c | 6 +++--- 3 files changed, 6 insertions(+), 7 deletions(-)

1 0

[tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/892' into maint-0.4.0
by teor＠torproject.org 09 Apr '19

09 Apr '19

commit 92e8bdf296c042ad386b2acb764bb4f4cfd2de0f Merge: 61e6b217c 5613968d5 Author: teor <teor(a)torproject.org> Date: Tue Apr 9 11:35:41 2019 +1000 Merge remote-tracking branch 'tor-github/pr/892' into maint-0.4.0 changes/bug28614_better_logging | 6 ++++++ src/feature/nodelist/networkstatus.c | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-)

1 0

[tor/release-0.4.0] manpage: Clarify that Tor does stream isolation between *Port listeners by default
by teor＠torproject.org 09 Apr '19

09 Apr '19

commit 61e6b217c5c83bc49e888f594f931c00c3e9b971 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Mon Mar 25 15:40:46 2019 +0200 manpage: Clarify that Tor does stream isolation between *Port listeners by default cherry-pick of tor-github/pr/841 to maint-0.4.0. --- changes/doc29121 | 3 +++ doc/tor.1.txt | 14 +++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/changes/doc29121 b/changes/doc29121 new file mode 100644 index 000000000..dd31cc9c7 --- /dev/null +++ b/changes/doc29121 @@ -0,0 +1,3 @@ + o Documentation: + - Clarify that Tor performs stream isolation between *Port listeners by + default. Resolves issue 29121. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index ea9942a28..c2df7687f 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1230,6 +1230,8 @@ The following options are useful only for clients (that is, if information to anybody watching your network, and allow anybody to use your computer as an open proxy. + + + If multiple entries of this option are present in your configuration + file, Tor will perform stream isolation between listeners by default. The _isolation flags_ arguments give Tor rules for which streams received on this SocksPort are allowed to share circuits with one another. Recognized isolation flags are: @@ -1472,14 +1474,18 @@ The following options are useful only for clients (that is, if protocol instead of SOCKS. Set this to 0 if you don't want to allow "HTTP CONNECT" connections. Set the port to "auto" to have Tor pick a port for you. This directive can be - specified multiple times to bind to multiple addresses/ports. See + specified multiple times to bind to multiple addresses/ports. If multiple + entries of this option are present in your configuration file, Tor will + perform stream isolation between listeners by default. See SOCKSPort for an explanation of isolation flags. (Default: 0) [[TransPort]] **TransPort** \['address':]__port__|**auto** [_isolation flags_]:: Open this port to listen for transparent proxy connections. Set this to 0 if you don't want to allow transparent proxy connections. Set the port to "auto" to have Tor pick a port for you. This directive can be - specified multiple times to bind to multiple addresses/ports. See + specified multiple times to bind to multiple addresses/ports. If multiple + entries of this option are present in your configuration file, Tor will + perform stream isolation between listeners by default. See SOCKSPort for an explanation of isolation flags. + + TransPort requires OS support for transparent proxies, such as BSDs' pf or @@ -1516,7 +1522,9 @@ The following options are useful only for clients (that is, if included in old versions of FreeBSD, etc) using the NATD protocol. Use 0 if you don't want to allow NATD connections. Set the port to "auto" to have Tor pick a port for you. This directive can be - specified multiple times to bind to multiple addresses/ports. See + specified multiple times to bind to multiple addresses/ports. If multiple + entries of this option are present in your configuration file, Tor will + perform stream isolation between listeners by default. See SocksPort for an explanation of isolation flags. + + This option is only for people who cannot use TransPort. (Default: 0)

1 0