- tor-commits - lists.torproject.org

[tor/release-0.2.2] closer to an 0.2.2.34 changelog
by arma＠torproject.org 26 Oct '11

26 Oct '11

commit d632c58c7c9ff36da26bfcb8e202327af19689d6 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Oct 26 16:25:03 2011 -0400 closer to an 0.2.2.34 changelog --- ChangeLog | 56 ++++++++++++++++++++++++++++++++++++++++++ changes/bug4059 | 5 --- changes/bug4115 | 7 ----- changes/bug4124 | 6 ---- changes/bug4201 | 5 --- changes/bug4212 | 13 --------- changes/bug4251 | 8 ------ changes/bug4259 | 4 --- changes/bug4309 | 5 --- changes/dirreq-stats-default | 5 --- changes/geoip-october2011 | 3 -- changes/ticket-4063 | 6 ---- changes/windows_8 | 5 --- 13 files changed, 56 insertions(+), 72 deletions(-) diff --git a/ChangeLog b/ChangeLog index e1a0c87..4b508eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,59 @@ +Changes in version 0.2.2.34 - 2011-10-?? + o Security fixes: + - Bridge relays now do their directory fetches inside Tor TLS + connections, like all the other clients do, rather than connecting + directly to the DirPort like public relays do. Removes another + avenue for enumerating bridges. Fixes bug 4115; bugfix on 0.2.0.35. + - Bridges relays now build circuits for themselves in a more similar + way to how clients build them. Removes another avenue for + enumerating bridges. Fixes bug 4124; bugfix on 0.2.0.3-alpha, + when bridges were introduced. + + o Major bugfixes: + - Fix a crash bug when changing node restrictions while a DNS lookup + is in-progress. Fixes bug 4259; bugfix on 0.2.2.25-alpha. Bugfix + by "Tey'". + - Don't launch a useless circuit after failing to use one of a + hidden service's introduction points. Previously, we would + launch a new introduction circuit, but not set the hidden service + which that circuit was intended to connect to, so it would never + actually be used. A different piece of code would then create a + new introduction circuit correctly. Bug reported by katmagic and + found by Sebastian Hahn. Bugfix on 0.2.1.13-alpha; fixes bug 4212. + + o Minor bugfixes: + - Change an integer overflow check in the OpenBSD_Malloc code so + that GCC is less likely to eliminate it as impossible. Patch + from Mansour Moufid. Fixes bug 4059. + - When a hidden service turns an extra service-side introduction + circuit into a general-purpose circuit, free the rend_data and + intro_key fields first, so we won't leak memory if the circuit + is cannibalized for use as another service-side introduction + circuit. Bugfix on 0.2.1.7-alpha; fixes bug 4251. + - Bridges now skip DNS self-tests, to act a little more stealthily. + Fixes bug 4201; bugfix on 0.2.0.3-alpha, which first introduced + bridges. Patch by "warms0x". + + o Minor bugfixes (log messages and documentation): + - Remove a confusing dollar sign from the example fingerprint in the + man page, and also make the example fingerprint a valid one. Fixes + bug 4309; bugfix on 0.2.1.3-alpha. + - The next version of Windows will be called Windows 8, and it has + a major version of 6, minor version of 2. Correctly identify that + version instead of calling it "Very recent version". Resolves + ticket 4153; reported by funkstar. + - Downgrade log messages about circuit timeout calibration from + "notice" to "info": they don't require or suggest any human + intervention. Patch from Tom Lowenthal. Fixes bug 4063; + bugfix on 0.2.2.14-alpha. + + o Minor features: + - Turn on directory request statistics by default and include them in + extra-info descriptors. Don't break if we have no GeoIP database. + Backported from 0.2.3.1-alpha; implements ticket 3951. + - Update to the October 4 2011 Maxmind GeoLite Country database. + + Changes in version 0.2.2.33 - 2011-09-13 Tor 0.2.2.33 fixes several bugs, and includes a slight tweak to Tor's TLS handshake that makes relays and bridges that run this new version diff --git a/changes/bug4059 b/changes/bug4059 deleted file mode 100644 index 82a4b1a..0000000 --- a/changes/bug4059 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - Change an integer overflow check in the OpenBSD_Malloc code so - that GCC is less likely to eliminate it as impossible. Patch - from Mansour Moufid. Fixes bug 4059. - diff --git a/changes/bug4115 b/changes/bug4115 deleted file mode 100644 index 626791a..0000000 --- a/changes/bug4115 +++ /dev/null @@ -1,7 +0,0 @@ - o Security fixes: - - Bridge relays now do their directory fetches inside Tor TLS - connections, like all the other clients do, rather than connecting - directly to the DirPort like public relays do. Removes another - avenue for enumerating bridges. Fixes part of bug 4115; bugfix - on 0.2.0.35. - diff --git a/changes/bug4124 b/changes/bug4124 deleted file mode 100644 index abe93cc..0000000 --- a/changes/bug4124 +++ /dev/null @@ -1,6 +0,0 @@ - o Security fixes: - - Bridges relays now build circuits for themselves in a more similar - way to how clients build them. Removes another avenue for - enumerating bridges. Fixes bug 4124; bugfix on 0.2.0.3-alpha, - when bridges were introduced. - diff --git a/changes/bug4201 b/changes/bug4201 deleted file mode 100644 index 6f7d715..0000000 --- a/changes/bug4201 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - Bridges now skip DNS self-tests, to act a little more stealthily. - Fixes bug 4201; bugfix on 0.2.0.3-alpha, which first introduced - bridges. Patch by "warms0x". - diff --git a/changes/bug4212 b/changes/bug4212 deleted file mode 100644 index 6222a59..0000000 --- a/changes/bug4212 +++ /dev/null @@ -1,13 +0,0 @@ - o Major bugfixes: - - - Don't launch a useless circuit after failing to use one of a - hidden service's introduction points. Previously, we would - launch a new introduction circuit, but not set the hidden - service which that circuit was intended to connect to, so it - would never actually be used. A different piece of code would - then create a new introduction circuit correctly, so this bug - was harmless until it caused an assertion in the client-side - part of the #3825 fix to fail. Bug reported by katmagic and - found by Sebastian Hahn. Bugfix on 0.2.1.13-alpha; fixes bug - 4212. - diff --git a/changes/bug4251 b/changes/bug4251 deleted file mode 100644 index 303c9e6..0000000 --- a/changes/bug4251 +++ /dev/null @@ -1,8 +0,0 @@ - o Minor bugfixes: - - - When a hidden service turns an extra service-side introduction - circuit into a general-purpose circuit, free the rend_data and - intro_key fields first, so they won't be leaked if the circuit - is cannibalized for use as another service-side introduction - circuit. Bugfix on 0.2.1.7-alpha; fixes bug 4251. - diff --git a/changes/bug4259 b/changes/bug4259 deleted file mode 100644 index bfccd3a..0000000 --- a/changes/bug4259 +++ /dev/null @@ -1,4 +0,0 @@ - o Major bugfixes: - - Fix a crash bug when changing node restrictions while a DNS lookup - is in-progress. Fixes bug 4259; bugfix on 0.2.2.25-alpha. Bugfix - by "Tey'". diff --git a/changes/bug4309 b/changes/bug4309 deleted file mode 100644 index f4f910e..0000000 --- a/changes/bug4309 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - Remove a confusing dollar sign from the example fingerprint in the - man page, and also make example fingerprint a valid one. Fixes bug - 4309; bugfix on 0.2.1.3-alpha. - diff --git a/changes/dirreq-stats-default b/changes/dirreq-stats-default deleted file mode 100644 index df7ac11..0000000 --- a/changes/dirreq-stats-default +++ /dev/null @@ -1,5 +0,0 @@ - o Minor features: - - Turn on directory request statistics by default and include them in - extra-info descriptors. Don't break if we have no GeoIP database. - Backported from 0.2.3.1-alpha; implements ticket 3951. - diff --git a/changes/geoip-october2011 b/changes/geoip-october2011 deleted file mode 100644 index d5b6910..0000000 --- a/changes/geoip-october2011 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features: - - Update to the October 4 2011 Maxmind GeoLite Country database. - diff --git a/changes/ticket-4063 b/changes/ticket-4063 deleted file mode 100644 index 6a985b8..0000000 --- a/changes/ticket-4063 +++ /dev/null @@ -1,6 +0,0 @@ - o Minor bugfixes (usability): - - Downgrade log messages about circuit timeout calibration from - "notice" to "info": they don't require or suggest any human - intervention. Patch from Tom Lowenthal. Fixes bug 4063; - bugfix on 0.2.2.14-alpha. - diff --git a/changes/windows_8 b/changes/windows_8 deleted file mode 100644 index 405e4fa..0000000 --- a/changes/windows_8 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - The next version of Windows will be called Windows 8, and it has a major - version of 6, minor version of 2. Correctly identify that version instead - of calling it "Very recent version". Fixes bug 4153; reported by funkstar. -

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 26 Oct '11

26 Oct '11

commit 05c94ae7d3443b7a9df3d385f57c62f416f7960a Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 26 20:15:37 2011 +0000 Update translations for gettor --- fr/gettor.po | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/fr/gettor.po b/fr/gettor.po index d8fb875..8ead25f 100644 --- a/fr/gettor.po +++ b/fr/gettor.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-10 01:52-0400\n" -"PO-Revision-Date: 2011-10-26 19:42+0000\n" +"PO-Revision-Date: 2011-10-26 20:03+0000\n" "Last-Translator: arpalord <arpalord(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -239,7 +239,7 @@ msgid "" "3.) Verify all files as described in the mail you received with \n" "each package. (gpg --verify)" msgstr "" -"3.) Vérifiez tous les fichiers tél que décrit dans l'e-mail\n" +"3.) Vérifiez tous les fichiers tel que décrit dans l'e-mail\n" "que vous avez reçu avec chaque paquet. (gpg --verify)" #: lib/gettor/i18n.py:117 @@ -566,7 +566,7 @@ msgstr "" #: lib/gettor/i18n.py:255 msgid "What is the Tor Browser Bundle?" -msgstr "" +msgstr "Qu'est ce que Tor Browser Bundle ?" #: lib/gettor/i18n.py:257 msgid "" @@ -574,6 +574,9 @@ msgid "" "The bundle comes with everything you need to safely browse the Internet.\n" "Just extract it and run." msgstr "" +"Le navigateur Tor (TBB) est le paquetage que nous recommendons à la plupart des utilisateurs.\n" +"Le paquetage est livré avec tout ce que vous avez besoin pour naviguer en sécurité sur Internet.\n" +"Il suffit de l'extraire et de le démarrer." #: lib/gettor/i18n.py:261 msgid "What package should I request?" @@ -586,6 +589,10 @@ msgid "" "is a short explanation of all packages to request and what operating \n" "systems there are suitable for:" msgstr "" +"Cela dépend du système d'exploitation que vous utilisez. Par exemple, si " +"votre système d'exploitation est Microsoft Windows, vous devriez demander " +"\"windows\". Voici une courte explication de tous les paquetages à utiliser " +"et à quels systèmes d'exploitation ils sont adaptés: " #: lib/gettor/i18n.py:268 msgid "How do I extract the file(s) you sent me?"

1 0

[tor/master] closer to a changelog for the next alpha
by arma＠torproject.org 26 Oct '11

26 Oct '11

commit c21c8daaaf9dfc1f3a700e2176fb51e7185d021a Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Oct 26 16:13:53 2011 -0400 closer to a changelog for the next alpha --- ChangeLog | 95 ++++++++++++++++++++++++++-------------------- changes/bug4309 | 5 -- changes/cov479 | 5 -- changes/cov484 | 4 -- changes/cov_485,486,487 | 5 -- changes/ticket4294 | 8 ---- 6 files changed, 54 insertions(+), 68 deletions(-) diff --git a/ChangeLog b/ChangeLog index d1bb44d..18505dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,46 +1,66 @@ Changes in version 0.2.3.6-alpha - 2011-10-?? o Major features: - - Implement a new handshake protocol for authenticating Tors to + - Implement a new handshake protocol (v3) for authenticating Tors to each other over TLS. It should be more resistant to fingerprinting than previous protocols, and should require less TLS hacking for - future Tor implementations. Implements Proposal 185. + future Tor implementations. Implements proposal 185. - Allow variable-length padding cells to disguise the length of - Tor's TLS records. Implements part of Proposal 184. + Tor's TLS records. Implements part of proposal 184. o Major bugfixes (hidden services): - - Don't launch a useless circuit after failing to use one of a - hidden service's introduction points. Previously, we would - launch a new introduction circuit, but not set the hidden service - which that circuit was intended to connect to, so it would never - actually be used. A different piece of code would then create a - new introduction circuit correctly, so this bug was harmless until - it caused an assertion in the client-side part of the #3825 fix - to fail. Bug reported by katmagic and found by Sebastian Hahn. - Bugfix on 0.2.1.13-alpha; fixes bug 4212. + - Improve hidden service robustness: when an attempt to connect to + a hidden service ends, be willing to refetch its hidden service + descriptors from each of the HSDir relays responsible for them + immediately. Previously, we would not consider refetching the + service's descriptors from each HSDir for 15 minutes after the last + fetch, which was inconvenient if the hidden service was not running + during the first attempt. Bugfix on 0.2.0.18-alpha; fixes bug 3335. - When one of a hidden service's introduction points appears to be unreachable, stop trying it. Previously, we would keep trying to build circuits to the introduction point until we lost the descriptor, usually because the user gave up and restarted Tor. Partly fixes bug 3825. - - When an attempt to connect to a hidden service ends, consider - refetching its hidden service descriptors from each of the HSDir - relays responsible for them immediately. Previously, we would not - consider refetching the service's descriptors from each HSDir for - 15 minutes after the last fetch; this behaviour was inconvenient - if the hidden service was not running during the first attempt, - for example. Bugfix on 0.2.0.18-alpha; fixes bug 3335. + - Don't launch a useless circuit after failing to use one of a + hidden service's introduction points. Previously, we would + launch a new introduction circuit, but not set the hidden service + which that circuit was intended to connect to, so it would never + actually be used. A different piece of code would then create a + new introduction circuit correctly. Bug reported by katmagic and + found by Sebastian Hahn. Bugfix on 0.2.1.13-alpha; fixes bug 4212. o Major bugfixes (other): - Don't update the AccountingSoftLimitHitAt state file entry whenever tor gets started. This prevents a wrong average bandwidth estimate, which would cause relays to always start a new accounting interval at the earliest possible moment. Fixes bug 2003; bugfix - on 0.2.2.7-alpha. Reported by BryonEldridge, who also helped + on 0.2.2.7-alpha. Reported by BryonEldridge, who also helped immensely in tracking this bug down. - Fix a crash bug when changing node restrictions while a DNS lookup is in-progress. Fixes bug 4259; bugfix on 0.2.2.25-alpha. Bugfix by "Tey'". + o Minor bugfixes (on 0.2.2.x and earlier): + - When a hidden service turns an extra service-side introduction + circuit into a general-purpose circuit, free the rend_data and + intro_key fields first, so we won't leak memory if the circuit + is cannibalized for use as another service-side introduction + circuit. Bugfix on 0.2.1.7-alpha; fixes bug 4251. + - Rephrase the log message emitted if the TestSocks check is + successful. Patch from Fabian Keil; fixes bug 4094. + - Bridges now skip DNS self-tests, to act a little more stealthily. + Fixes bug 4201; bugfix on 0.2.0.3-alpha, which first introduced + bridges. Patch by "warms0x". + - Remove a confusing dollar sign from the example fingerprint in the + man page, and also make the example fingerprint a valid one. Fixes + bug 4309; bugfix on 0.2.1.3-alpha. + - Fix internal bug-checking logic that was supposed to catch + failures in digest generation so that it will fail more robustly + if we ask for a nonexistent algorithm. Found by Coverity Scan. + Bugfix on 0.2.2.1-alpha; fixes Coverity CID 479. + - Report any failure in init_keys() calls launched because our + IP address has changed. Spotted by Coverity Scan. Bugfix on + 0.1.1.4-alpha; fixes CID 484. + o Minor bugfixes (on 0.2.3.x): - Fix a bug in configure.in that kept it from building a configure script with autoconf versions earlier than 2.61. Fixes bug 2430; @@ -49,37 +69,30 @@ Changes in version 0.2.3.6-alpha - 2011-10-?? Internet if they have specified an RFC1918 address. Previously, we would warn if the user had specified any non-loopback address. Bugfix on 0.2.3.3-alpha. Fixes bug 4018; reported by Tas. - - o Minor bugfixes (on 0.2.2.x and earlier): - - When one of a hidden service's introduction points times out, - consider trying it again during the next attempt to connect to - the HS. Previously, we would not try it again unless a newly - fetched descriptor contained it. Required by fixes for bugs - 1297 and 3825. - - Rephrase the log message emitted if the TestSocks check is - successful. Patch from Fabian Keil; fixes bug 4094. - - Bridges now skip DNS self-tests, to act a little more stealthily. - Fixes bug 4201; bugfix on 0.2.0.3-alpha, which first introduced - bridges. Patch by "warms0x". - - When a hidden service turns an extra service-side introduction - circuit into a general-purpose circuit, free the rend_data and - intro_key fields first, so we won't leak memory if the circuit - is cannibalized for use as another service-side introduction - circuit. Bugfix on 0.2.1.7-alpha; fixes bug 4251. + - Fix memory leaks in the failing cases of the new SocksPort and + ControlPort code. Found by Coverity Scan. Bugfix on 0.2.3.3-alpha; + fixes coverity CIDs 485, 486, and 487. o Minor features: + - When a hidden service's introduction point times out, consider + trying it again during the next attempt to connect to the + HS. Previously, we would not try it again unless a newly fetched + descriptor contained it. Required by fixes for bugs 1297 and 3825. - The next version of Windows will be called Windows 8, and it has a major version of 6, minor version of 2. Correctly identify that version instead of calling it "Very recent version". Resolves ticket 4153; reported by funkstar. - - The bridge authority now writes statistics on how many bridge + - The Bridge Authority now writes statistics on how many bridge descriptors it gave out in total, and how many unique descriptors - it gave out. Implements ticket 4200. + it gave out. It also lists how often the most and least commonly + fetched descriptors were given out, as well as the median and + 25th/75th percentile. Implements tickets 4200 and 4294. - Update to the October 4 2011 Maxmind GeoLite Country database. o Code simplifications and refactoring: - - Remove the ability to define TRACK_SERVED_TIME. The feature - wasn't used and is now outdated that microdescriptors are around. + - Remove some old code to remember statistics about which descriptors + we've served as a directory mirror. The feature wasn't used and + is outdated now that microdescriptors are around. - Rename Tor functions that turn strings into addresses, so that "parse" indicates that no hostname resolution occurs, and "lookup" indicates that hostname resolution may occur. This diff --git a/changes/bug4309 b/changes/bug4309 deleted file mode 100644 index f4f910e..0000000 --- a/changes/bug4309 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - Remove a confusing dollar sign from the example fingerprint in the - man page, and also make example fingerprint a valid one. Fixes bug - 4309; bugfix on 0.2.1.3-alpha. - diff --git a/changes/cov479 b/changes/cov479 deleted file mode 100644 index afbaffc..0000000 --- a/changes/cov479 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - Fix internal bug-checking logic that was supposed to catch - failures in digest generation so that it will fail more robustly - if we ask for a nonexistent algorithm. Found by Coverity Scan. - Bugfix on 0.2.2.1-alpha; fixes Coverity CID 479. diff --git a/changes/cov484 b/changes/cov484 deleted file mode 100644 index 33adbda..0000000 --- a/changes/cov484 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes: - - Report any failure in init_keys() calls done because our IP address - has changed. Spotted by Coverity Scan. Bugfix on 0.1.1.4-alpha; - fixes CID 484. diff --git a/changes/cov_485,486,487 b/changes/cov_485,486,487 deleted file mode 100644 index 648b010..0000000 --- a/changes/cov_485,486,487 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - Fix memory leaks in the failing cases of the new SocksPort and - ControlPort code. Found by Coverity Scan. Bugfix on - 0.2.3.3-alpha; fixes coverity CID 485, 486, and 487. - diff --git a/changes/ticket4294 b/changes/ticket4294 deleted file mode 100644 index 5041495..0000000 --- a/changes/ticket4294 +++ /dev/null @@ -1,8 +0,0 @@ -(NOTE: THIS SHOULD REPLACE THE TICKET 4200 ENTRY IN THE CHANGELOG) - o Minor features: - - The Bridge Authority now writes statistics on how many bridge - descriptors it gave out in total, and how many unique descriptors it - gave out. It also lists how often the most and least commonly fetched - descriptors were given out, as well as the median and 25/75 percentile. - Implements tickets 4200 and 4294. -

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 26 Oct '11

26 Oct '11

commit ba6dfc120bacb3ac87f6314b9fd014df5c032ff3 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 26 19:45:33 2011 +0000 Update translations for gettor --- fr/gettor.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fr/gettor.po b/fr/gettor.po index 6e55479..d8fb875 100644 --- a/fr/gettor.po +++ b/fr/gettor.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-10 01:52-0400\n" -"PO-Revision-Date: 2011-10-25 23:39+0000\n" +"PO-Revision-Date: 2011-10-26 19:42+0000\n" "Last-Translator: arpalord <arpalord(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -166,7 +166,7 @@ msgstr "" #: lib/gettor/i18n.py:87 msgid "If you select no language, you will receive the English version." msgstr "" -"Si vous sélectionnez pas de langue, vous recevrez la version anglaise." +"Si vous ne sélectionnez pas de langue, vous recevrez la version anglaise." #: lib/gettor/i18n.py:89 msgid ""

1 0

[torsocks/master] Issue 32: Irssi locks connecting to hidden service
by hoganrobert＠torproject.org 26 Oct '11

26 Oct '11

commit 13653186775d65625930341a838511325e246f18 Author: Robert Hogan <robert(a)roberthogan.net> Date: Tue Oct 25 22:50:11 2011 +0100 Issue 32: Irssi locks connecting to hidden service During connect() we can end up getting a EWOULDBLOCK/EAGAIN while talking to the SOCKS proxy. This seems to happen when attempting to read a SOCKSV4 connect response from Tor when using the command 'torsocks irssi -c 4eiruntyxxbgfv7o.onion' for example. EWOULDBLOCK isn't a valid error during connect(), so if we get it don't return it to the client - use EINPROGRESS instead. Diagnosed and patched by: foobi...(a)gmail.com --- src/torsocks.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/torsocks.c b/src/torsocks.c index c4004d9..f559eec 100644 --- a/src/torsocks.c +++ b/src/torsocks.c @@ -417,6 +417,12 @@ int torsocks_connect_guts(CONNECT_SIGNATURE, int (*original_connect)(CONNECT_SIG if ((newconn->state == FAILED) || (newconn->state == DONE)) kill_socks_request(newconn); errno = rc; + /* We may get either of these if there are no bytes to read from + the non-blocking connection in handle_request(). Since we are + wrapping connect() here we can't return EWOULDBLOCK/EAGAIN + so override it with something the client will accept.*/ + if (errno == EWOULDBLOCK || errno == EAGAIN) + errno = EINPROGRESS; return((rc ? -1 : 0)); } }

1 0

[torsocks/master] Add documentation to 'make dist'
by hoganrobert＠torproject.org 26 Oct '11

26 Oct '11

commit 2f8fa54dd63a81edc4cfd9d2187adb15521fe59d Author: Robert Hogan <robert(a)roberthogan.net> Date: Wed Oct 26 19:31:49 2011 +0100 Add documentation to 'make dist' --- doc/Makefile.am | 6 ++++++ test/Makefile.am | 2 ++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index 222ba92..666abeb 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -6,3 +6,9 @@ dist_conf_DATA = torsocks.conf # Install man pages dist_man_MANS = torsocks.1 torsocks.8 usewithtor.1 torsocks.conf.5 + +dist_data_DATA = socks/SOCKS5 socks/SOCKS4.protocol socks/socks-extensions.txt \ + patches/compilewarnings.patch patches/conffile.patch patches/getaddrbyhost.patch \ + patches/getpeername.patch patches/infiniteloop.patch patches/localaddresses.patch \ + patches/README patches/README.TORDNS patches/tordns.patch notes/DEBUG + diff --git a/test/Makefile.am b/test/Makefile.am index c04e5ea..10e037b 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -3,3 +3,5 @@ noinst_PROGRAMS= test_torsocks test_torsocks_SOURCES= test_torsocks.c test_torsocks_LDFLAGS= $(TESTLDFLAGS) CLEANFILES= test_torsocks + +dist_data_DATA = run_tests.sh expectedresults.txt \ No newline at end of file

1 0

[tor/master] Fix memory leak in retry_all_listeners: Coverity CID 485
by nickm＠torproject.org 26 Oct '11

26 Oct '11

commit b1632c3fb742f94a6ce0de201653a8c4a9d2887f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 6 12:57:07 2011 -0400 Fix memory leak in retry_all_listeners: Coverity CID 485 --- src/or/connection.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index af05729..bf39a5c 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1988,13 +1988,13 @@ retry_all_listeners(smartlist_t *replaced_conns, options->ControlListenAddress, options->ControlPort, "127.0.0.1", new_conns, 0) < 0) - return -1; + retval = -1; if (retry_listeners(listeners, CONN_TYPE_CONTROL_LISTENER, options->ControlSocket, options->ControlSocket ? 1 : 0, NULL, new_conns, 1) < 0) - return -1; + retval = -1; /* Any members that were still in 'listeners' don't correspond to * any configured port. Kill 'em. */

1 0

[tor/master] Fix memory leak in options_act_reversible: fix Coverity CID 486, 487
by nickm＠torproject.org 26 Oct '11

26 Oct '11

commit 097ed9998bc93b2dff1c6dcbff974ab4d8d17731 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 6 12:54:34 2011 -0400 Fix memory leak in options_act_reversible: fix Coverity CID 486,487 --- src/or/config.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 3080da0..c5322f5 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1077,8 +1077,11 @@ options_act_reversible(const or_options_t *old_options, char **msg) } /* Adjust the client port configuration so we can launch listeners. */ - if (parse_client_ports(options, 0, msg, &n_client_ports)) - return -1; + if (parse_client_ports(options, 0, msg, &n_client_ports)) { + if (!*msg) + *msg = tor_strdup("Unexpected problem parsing client port config"); + goto rollback; + } /* Set the hibernation state appropriately.*/ consider_hibernation(time(NULL));

1 0

[tor/master] Merge branch 'cov_run224_squashed'
by nickm＠torproject.org 26 Oct '11

26 Oct '11

commit 6df3869f3b3448d041ece19498d062104c32fa45 Merge: e0a053b ce6a2c2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 26 13:22:51 2011 -0400 Merge branch 'cov_run224_squashed' changes/cov_485,486,487 | 5 +++++ src/or/config.c | 7 +++++-- src/or/connection.c | 4 ++-- 3 files changed, 12 insertions(+), 4 deletions(-)

1 0

[tor/master] Changelog for recent coverity issues
by nickm＠torproject.org 26 Oct '11

26 Oct '11

commit ce6a2c2f140a3c1af9d6544f90d5fff1e06ffc42 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 6 14:08:07 2011 -0400 Changelog for recent coverity issues --- changes/cov_485,486,487 | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/changes/cov_485,486,487 b/changes/cov_485,486,487 new file mode 100644 index 0000000..648b010 --- /dev/null +++ b/changes/cov_485,486,487 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Fix memory leaks in the failing cases of the new SocksPort and + ControlPort code. Found by Coverity Scan. Bugfix on + 0.2.3.3-alpha; fixes coverity CID 485, 486, and 487. +

1 0