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

[tor/release-0.2.2] Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
by arma＠torproject.org 02 Feb '12

02 Feb '12

commit 0126150c2d42c028c208529caf853c0d19ec4f5f Merge: c78a314 8d5c0e5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 11 11:07:13 2012 -0500 Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2 src/common/tortls.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)

1 0

[tor/release-0.2.2] Fix a compilation warning for our bug4822 fix on 64-bit linux
by arma＠torproject.org 02 Feb '12

02 Feb '12

commit 8d5c0e58ea19fa1bc662c23e1a7ae77d688400fc Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 11 11:06:31 2012 -0500 Fix a compilation warning for our bug4822 fix on 64-bit linux --- src/common/tortls.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/tortls.c b/src/common/tortls.c index d88a59b..e624183 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -775,8 +775,8 @@ tor_tls_context_new(crypto_pk_env_t *identity, unsigned int key_lifetime, "might otherwise be vulnerable to CVE-2011-4657 " "(compile-time version %08lx (%s); " "runtime version %08lx (%s))", - OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_TEXT, - SSLeay(), SSLeay_version(SSLEAY_VERSION)); + (unsigned long)OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_TEXT, + (unsigned long)SSLeay(), SSLeay_version(SSLEAY_VERSION)); SSL_CTX_set_options(result->ctx, SSL_OP_NO_SSLv3); }

1 0

[tor/release-0.2.2] Merge remote-tracking branch 'public/bug4533_part2' into maint-0.2.2
by arma＠torproject.org 02 Feb '12

02 Feb '12

commit 6d595fa4cf679cf7c66673726596548758a298bc Merge: 676bba8 dd4b1a2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 18 15:29:25 2012 -0500 Merge remote-tracking branch 'public/bug4533_part2' into maint-0.2.2 changes/bug4533_part2 | 5 +++++ src/common/compat.h | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-)

1 0

[tor/release-0.2.2] Fix SOCKET_OK test on win64.
by arma＠torproject.org 02 Feb '12

02 Feb '12

commit dd4b1a2ac605ff53c0eda4ebf44ddd84c3b243c0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 18 10:47:22 2012 -0500 Fix SOCKET_OK test on win64. Bugfix on 0.2.2.29-beta; partial fix for 4533; found by wanoskarnet --- changes/bug4533_part2 | 5 +++++ src/common/compat.h | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/changes/bug4533_part2 b/changes/bug4533_part2 new file mode 100644 index 0000000..7e0f7c3 --- /dev/null +++ b/changes/bug4533_part2 @@ -0,0 +1,5 @@ + o Major bugfixes: + - Fix the SOCKET_OK test that we use to tell when socket + creation fails so that it works on Win64. Fixes part of bug + 4533; bugfix on 0.2.2.29-beta. Bug found by wanoskarnet. + diff --git a/src/common/compat.h b/src/common/compat.h index e0b074c..d2f1fd1 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -396,7 +396,7 @@ typedef int socklen_t; #ifdef MS_WINDOWS #define tor_socket_t intptr_t -#define SOCKET_OK(s) ((unsigned)(s) != INVALID_SOCKET) +#define SOCKET_OK(s) ((SOCKET)(s) != INVALID_SOCKET) #else #define tor_socket_t int #define SOCKET_OK(s) ((s) >= 0)

1 0

[tor/release-0.2.2] Documentation for GiveGuardFlagTo... option
by arma＠torproject.org 02 Feb '12

02 Feb '12

commit 676bba8e0c91b7885aa8a9b7f55b008ccccfe282 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 17 15:28:23 2012 -0500 Documentation for GiveGuardFlagTo... option --- changes/bug4012_022 | 3 +++ doc/tor.1.txt | 4 ++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/changes/bug4012_022 b/changes/bug4012_022 new file mode 100644 index 0000000..f101db5 --- /dev/null +++ b/changes/bug4012_022 @@ -0,0 +1,3 @@ + o Minor bugfixes (documentation): + - Document the GiveGuardFlagTo_CVE_2011_2768_VulnerableRelays + directory authority option (introduced in Tor 0.2.2.34). diff --git a/doc/tor.1.txt b/doc/tor.1.txt index d91f873..558b31b 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1347,6 +1347,10 @@ DIRECTORY AUTHORITY SERVER OPTIONS votes on whether to accept relays as hidden service directories. (Default: 1) +GiveGuardFlagTo_CVE_2011_2768_VulnerableRelays **0**|**1**:: + When this option is set to 0, do not vote to give the Guard flag to any + version of Tor vulnerable to CVE-2011-2769. (Default: 0) + HIDDEN SERVICE OPTIONS ----------------------

1 0

[tor/release-0.2.2] Merge branch 'maint-0.2.2' into release-0.2.2
by arma＠torproject.org 02 Feb '12

02 Feb '12

commit 121ae29ed952a7203f0d96a60fef2f52d5cae23e Merge: 6cd6889 688903e Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Feb 2 02:33:03 2012 -0500 Merge branch 'maint-0.2.2' into release-0.2.2 changes/bug4012_022 | 3 +++ changes/bug4533_part2 | 5 +++++ changes/bug5005 | 3 +++ doc/tor.1.txt | 15 ++++++++++----- src/common/compat.h | 2 +- src/common/tortls.c | 4 ++-- 6 files changed, 24 insertions(+), 8 deletions(-)

1 0

[tor/release-0.2.2] Update "ClientOnly" man page entry
by arma＠torproject.org 02 Feb '12

02 Feb '12

commit 688903e919a4c0b942893d7b507a851e57e4e452 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Feb 2 02:31:28 2012 -0500 Update "ClientOnly" man page entry There isn't really any point to messing with it. Resolves ticket 5005. --- changes/bug5005 | 3 +++ doc/tor.1.txt | 11 ++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/changes/bug5005 b/changes/bug5005 new file mode 100644 index 0000000..04d8dfe --- /dev/null +++ b/changes/bug5005 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Update "ClientOnly" man page entry to explain that there isn't + really any point to messing with it. Resolves ticket 5005. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 558b31b..160feb0 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -499,11 +499,12 @@ The following options are useful only for clients (that is, if number like 60. (Default: 0) **ClientOnly** **0**|**1**:: - If set to 1, Tor will under no circumstances run as a server or serve - directory requests. The default is to run as a client unless ORPort is - configured. (Usually, you don't need to set this; Tor is pretty smart at - figuring out whether you are reliable and high-bandwidth enough to be a - useful server.) (Default: 0) + If set to 1, Tor will under no circumstances run as a relay or serve + directory requests. This config option is mostly meaningless: we + added it back when we were considering having Tor clients auto-promote + themselves to being relays if they were stable and fast enough. The + current behavior is simply that Tor is a client unless ORPort or + DirPort are configured. (Default: 0) **ExcludeNodes** __node__,__node__,__...__:: A list of identity fingerprints, nicknames, country codes and address

1 0

[tor/master] Merge branch 'maint-0.2.2'
by arma＠torproject.org 02 Feb '12

02 Feb '12

commit 92862c6d48026811c32d3e603524185778d0b4d7 Merge: d487d6f 688903e Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Feb 2 02:32:44 2012 -0500 Merge branch 'maint-0.2.2' changes/bug5005 | 3 +++ doc/tor.1.txt | 11 ++++++----- 2 files changed, 9 insertions(+), 5 deletions(-)

1 0

[tor/master] Update "ClientOnly" man page entry
by arma＠torproject.org 02 Feb '12

02 Feb '12

commit 688903e919a4c0b942893d7b507a851e57e4e452 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Feb 2 02:31:28 2012 -0500 Update "ClientOnly" man page entry There isn't really any point to messing with it. Resolves ticket 5005. --- changes/bug5005 | 3 +++ doc/tor.1.txt | 11 ++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/changes/bug5005 b/changes/bug5005 new file mode 100644 index 0000000..04d8dfe --- /dev/null +++ b/changes/bug5005 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Update "ClientOnly" man page entry to explain that there isn't + really any point to messing with it. Resolves ticket 5005. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 558b31b..160feb0 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -499,11 +499,12 @@ The following options are useful only for clients (that is, if number like 60. (Default: 0) **ClientOnly** **0**|**1**:: - If set to 1, Tor will under no circumstances run as a server or serve - directory requests. The default is to run as a client unless ORPort is - configured. (Usually, you don't need to set this; Tor is pretty smart at - figuring out whether you are reliable and high-bandwidth enough to be a - useful server.) (Default: 0) + If set to 1, Tor will under no circumstances run as a relay or serve + directory requests. This config option is mostly meaningless: we + added it back when we were considering having Tor clients auto-promote + themselves to being relays if they were stable and fast enough. The + current behavior is simply that Tor is a client unless ORPort or + DirPort are configured. (Default: 0) **ExcludeNodes** __node__,__node__,__...__:: A list of identity fingerprints, nicknames, country codes and address

1 0

[tor/maint-0.2.2] Update "ClientOnly" man page entry
by arma＠torproject.org 02 Feb '12

02 Feb '12

commit 688903e919a4c0b942893d7b507a851e57e4e452 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Feb 2 02:31:28 2012 -0500 Update "ClientOnly" man page entry There isn't really any point to messing with it. Resolves ticket 5005. --- changes/bug5005 | 3 +++ doc/tor.1.txt | 11 ++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/changes/bug5005 b/changes/bug5005 new file mode 100644 index 0000000..04d8dfe --- /dev/null +++ b/changes/bug5005 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Update "ClientOnly" man page entry to explain that there isn't + really any point to messing with it. Resolves ticket 5005. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 558b31b..160feb0 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -499,11 +499,12 @@ The following options are useful only for clients (that is, if number like 60. (Default: 0) **ClientOnly** **0**|**1**:: - If set to 1, Tor will under no circumstances run as a server or serve - directory requests. The default is to run as a client unless ORPort is - configured. (Usually, you don't need to set this; Tor is pretty smart at - figuring out whether you are reliable and high-bandwidth enough to be a - useful server.) (Default: 0) + If set to 1, Tor will under no circumstances run as a relay or serve + directory requests. This config option is mostly meaningless: we + added it back when we were considering having Tor clients auto-promote + themselves to being relays if they were stable and fast enough. The + current behavior is simply that Tor is a client unless ORPort or + DirPort are configured. (Default: 0) **ExcludeNodes** __node__,__node__,__...__:: A list of identity fingerprints, nicknames, country codes and address

1 0