- tor-commits - lists.torproject.org

[tor/master] Fix SOCKET_OK test on win64.
by nickm＠torproject.org 18 Jan '12

18 Jan '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/master] Merge remote-tracking branch 'public/bug4533_part2' into maint-0.2.2
by nickm＠torproject.org 18 Jan '12

18 Jan '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/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 18 Jan '12

18 Jan '12

commit 1772782e425734967981b79be1122017ef606dd0 Merge: d04bf66 6d595fa Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 18 15:29:41 2012 -0500 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug4533_part2 | 5 +++++ src/common/compat.h | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-)

1 0

[tor/maint-0.2.2] Fix SOCKET_OK test on win64.
by nickm＠torproject.org 18 Jan '12

18 Jan '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/maint-0.2.2] Merge remote-tracking branch 'public/bug4533_part2' into maint-0.2.2
by nickm＠torproject.org 18 Jan '12

18 Jan '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

[translation/orbot] Update translations for orbot
by translation＠torproject.org 18 Jan '12

18 Jan '12

commit 808816978eaf560eb81fa9fa2de28698cbbae532 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 18 20:15:05 2012 +0000 Update translations for orbot --- values-nl/strings.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/values-nl/strings.xml b/values-nl/strings.xml index 9e6e4e1..0ab07a0 100644 --- a/values-nl/strings.xml +++ b/values-nl/strings.xml @@ -195,6 +195,6 @@ Bezoek onze website op https://guardianproject.info/apps/orbot of stuur een emai <string name="unable_to_read_hidden_service_name">Kan hidden service naam niet lezen.</string> <string name="unable_to_start_tor">Kan Tor niet starten:</string> <string name="pref_use_sys_iptables_title">Gebruik standaard iptables</string> - <string name="pref_use_sys_iptables_summary">gebruik de ingebouwde iptables binary in plaats van de aan Orbot gekoppelde.</string> + <string name="pref_use_sys_iptables_summary">gebruik de ingebouwde iptables binary in plaats van de in Orbot geïntegreerde.</string> <string name="error_installing_binares">De Tor binaries konden niet worden geïnstalleerd of geüpgraded.</string> </resources>

1 0

[tor/master] Merge branch 'bug4012_023_squashed'
by nickm＠torproject.org 18 Jan '12

18 Jan '12

commit d04bf66120420e89ddb479316f4026869abc9154 Merge: 93d3a91 b14ac10 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 18 14:50:22 2012 -0500 Merge branch 'bug4012_023_squashed' changes/bug4012 | 8 ++++++++ doc/tor.1.txt | 29 +++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 0 deletions(-)

1 0

[tor/master] Add missing documentation for some options introduced in 0.2.3.x
by nickm＠torproject.org 18 Jan '12

18 Jan '12

commit b14ac10b7fdc6718d420b8c317b984c7ab1f5530 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 17 15:51:32 2012 -0500 Add missing documentation for some options introduced in 0.2.3.x --- changes/bug4012 | 8 ++++++++ doc/tor.1.txt | 29 +++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 0 deletions(-) diff --git a/changes/bug4012 b/changes/bug4012 new file mode 100644 index 0000000..082f39d --- /dev/null +++ b/changes/bug4012 @@ -0,0 +1,8 @@ + o Minor bugfixes (documentation): + - Add missing documentation for the MaxClientCircuitsPending, + UseMicrodescriptors, UserspaceIOCPBuffers, and + _UseFilteringSSLBufferevents options, all introduced during + the 0.2.3.x series. + + + diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 5ac2ba0..3715171 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -487,6 +487,21 @@ Other options can be specified either on the command-line (--option and you're running on Windows, setting this option to 1 will tell Libevent not to use the Windows IOCP networking API. (Default: 1) +**UserspaceIOCPBuffers** **0**|**1**:: + If IOCP is enabled (see DisableIOCP above), setting this option to 1 + will tell Tor to disable kernel-space TCP buffers, in order to avoid + needless copy operations and try not to run out of non-paged RAM. + This feature is experimental; don't use it yet unless you're eager to + help tracking down bugs. (Default: 0) + +**_UseFilteringSSLBufferevents** **0**|**1**:: + Tells Tor to do its SSL communication using a chain of + bufferevents: one for SSL and one for networking. This option has no + effect if bufferevents are disabled (in which case it can't turn on), or + if IOCP bufferevents are enabled (in which case it can't turn off). This + option is useful for debugging only; most users shouldn't touch it. + (Default: 0) + **CountPrivateBandwidth** **0**|**1**:: If this option is set, then Tor's rate-limiting applies not only to remote connections, but also to connections to private addresses like @@ -757,6 +772,11 @@ The following options are useful only for clients (that is, if but never attach a new stream to a circuit that is too old. (Default: 10 minutes) +**MaxClientCircuitsPending** __NUM__:: + Do not allow more than NUM circuits to be pending at a time for handling + client streams. A circuit is pending if we have begun constructing it, + but it has not yet been completely constructed. (Default: 32) + **NodeFamily** __node__,__node__,__...__:: The Tor servers, defined by their identity fingerprints or nicknames, constitute a "family" of similar or co-administered servers, so never use @@ -1042,6 +1062,15 @@ The following options are useful only for clients (that is, if To enable this option the compile time flag --enable-tor2webmode must be specified. (Default: 0) +**UseMicrodescriptors** **0**|**1**|**auto**:: + Microdescriptors are a smaller version of the information that Tor needs + in order to build its circuits. Using microdescriptors makes Tor clients + download less directory information, thus saving bandwidth. Directory + caches need to fetch regular descriptors and microdescriptors, so this + option doesn't save any bandwidth for them. If this option is set to + "auto" (recommended) then it is on for all clients that do not set + FetchUselessDescriptors. (Default: auto) + SERVER OPTIONS --------------

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 18 Jan '12

18 Jan '12

commit 93d3a917e878e42950faf6199205a6933a40c900 Merge: ee717f3 676bba8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 18 14:45:18 2012 -0500 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug4012_022 | 3 +++ doc/tor.1.txt | 4 ++++ 2 files changed, 7 insertions(+), 0 deletions(-)

1 0

[tor/master] Documentation for GiveGuardFlagTo... option
by nickm＠torproject.org 18 Jan '12

18 Jan '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