June 2013 - tor-commits - lists.torproject.org

r26222: {website} Alpha is now 0.2.4.14-alpha (website/trunk/include)
by Nick Mathewson 18 Jun '13

18 Jun '13

Author: nickm Date: 2013-06-18 20:02:08 +0000 (Tue, 18 Jun 2013) New Revision: 26222 Modified: website/trunk/include/versions.wmi Log: Alpha is now 0.2.4.14-alpha Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2013-06-18 11:09:50 UTC (rev 26221) +++ website/trunk/include/versions.wmi 2013-06-18 20:02:08 UTC (rev 26222) @@ -1,5 +1,5 @@ <define-tag version-stable whitespace=delete>0.2.3.25</define-tag> -<define-tag version-alpha whitespace=delete>0.2.4.13-alpha</define-tag> +<define-tag version-alpha whitespace=delete>0.2.4.14-alpha</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.3.25</define-tag> <define-tag version-win32-alpha whitespace=delete>0.2.4.12-alpha</define-tag>

1 0

[tor/release-0.2.4] Reformat changelog a little to follow arma rules on spacing
by nickm＠torproject.org 18 Jun '13

18 Jun '13

commit f5729b8c1d45933f57e8df432c63197ecf8f266e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 18 15:06:21 2013 -0400 Reformat changelog a little to follow arma rules on spacing --- ChangeLog | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 266a1cc..3fafe4b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,17 +5,17 @@ Changes in version 0.2.4.14-alpha - 2013-06-18 o Major bugfixes: - When we have too much memory queued in circuits (according to a new MaxMemInCellQueues option), close the circuits consuming the most - memory. This prevents us from running out of memory as a relay if - circuits fill up faster than they can be drained. Fixes - bug 9063; bugfix on the 54th commit of Tor. This bug is a further - fix beyond bug 6252, whose fix was merged into 0.2.3.21-rc. + memory. This prevents us from running out of memory as a relay if + circuits fill up faster than they can be drained. Fixes bug 9063; + bugfix on the 54th commit of Tor. This bug is a further fix beyond + bug 6252, whose fix was merged into 0.2.3.21-rc. This change also fixes an earlier approach taken in 0.2.4.13-alpha, - where we tried to solve this issue simply by imposing an upper limit on - the number of queued cells for a single circuit. That approach proved - to be problematic, since there are ways to provoke clients to send a - number of cells in excess of any such reasonable limit. Fixes bug - 9072; bugfix on 0.2.4.13-alpha. + where we tried to solve this issue simply by imposing an upper limit + on the number of queued cells for a single circuit. That approach + proved to be problematic, since there are ways to provoke clients to + send a number of cells in excess of any such reasonable limit. Fixes + bug 9072; bugfix on 0.2.4.13-alpha. - Limit hidden service descriptors to at most ten introduction points, to slow one kind of guard enumeration. Fixes bug 9002;

1 0

[tor/master] Fix some problems with the bug9002 fix.
by nickm＠torproject.org 18 Jun '13

18 Jun '13

commit 60d633c73a71d9ba514d4250fe00da5173e9968a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 18 11:54:57 2013 -0400 Fix some problems with the bug9002 fix. Fixes bug 9090; bug not in any released Tor. --- src/or/rendcommon.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index 812fce9..76786e0 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -1081,6 +1081,7 @@ rend_cache_store(const char *desc, size_t desc_len, int published, "attempt to improve reliability, but it could also be an " "attempt to do a guard enumeration attack. Rejecting.", safe_str_client(query)); + rend_service_descriptor_free(parsed); return -2; } tor_snprintf(key, sizeof(key), "0%s", query); @@ -1336,6 +1337,8 @@ rend_cache_store_v2_desc_as_client(const char *desc, "attempt to improve reliability, but it could also be an " "attempt to do a guard enumeration attack. Rejecting.", safe_str_client(rend_query->onion_address)); + retval = -2; + goto err; } } else { log_info(LD_REND, "Descriptor does not contain any introduction points.");

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
by nickm＠torproject.org 18 Jun '13

18 Jun '13

commit 7c4544e5a4780706dee65d2a3ff8c70000b55952 Merge: efa342f 60d633c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 18 14:45:29 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 src/or/rendcommon.c | 3 +++ 1 file changed, 3 insertions(+)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 18 Jun '13

18 Jun '13

commit f7986269c32b94929a705a8f125b353e505a488c Merge: 8a96a85 7c4544e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 18 14:47:15 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' src/or/rendcommon.c | 3 +++ 1 file changed, 3 insertions(+)

1 0

[tor/release-0.2.4] Fix some problems with the bug9002 fix.
by nickm＠torproject.org 18 Jun '13

18 Jun '13

commit 60d633c73a71d9ba514d4250fe00da5173e9968a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 18 11:54:57 2013 -0400 Fix some problems with the bug9002 fix. Fixes bug 9090; bug not in any released Tor. --- src/or/rendcommon.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index 812fce9..76786e0 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -1081,6 +1081,7 @@ rend_cache_store(const char *desc, size_t desc_len, int published, "attempt to improve reliability, but it could also be an " "attempt to do a guard enumeration attack. Rejecting.", safe_str_client(query)); + rend_service_descriptor_free(parsed); return -2; } tor_snprintf(key, sizeof(key), "0%s", query); @@ -1336,6 +1337,8 @@ rend_cache_store_v2_desc_as_client(const char *desc, "attempt to improve reliability, but it could also be an " "attempt to do a guard enumeration attack. Rejecting.", safe_str_client(rend_query->onion_address)); + retval = -2; + goto err; } } else { log_info(LD_REND, "Descriptor does not contain any introduction points.");

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
by nickm＠torproject.org 18 Jun '13

18 Jun '13

commit 7c4544e5a4780706dee65d2a3ff8c70000b55952 Merge: efa342f 60d633c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 18 14:45:29 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 src/or/rendcommon.c | 3 +++ 1 file changed, 3 insertions(+)

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.4' into release-0.2.4
by nickm＠torproject.org 18 Jun '13

18 Jun '13

commit cee6a991d2185b6bf600cda092c18eba83360efb Merge: fd9ba5e 7c4544e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 18 14:46:25 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' into release-0.2.4 src/or/rendcommon.c | 3 +++ 1 file changed, 3 insertions(+)

1 0

[tor/maint-0.2.4] Fix some problems with the bug9002 fix.
by nickm＠torproject.org 18 Jun '13

18 Jun '13

commit 60d633c73a71d9ba514d4250fe00da5173e9968a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 18 11:54:57 2013 -0400 Fix some problems with the bug9002 fix. Fixes bug 9090; bug not in any released Tor. --- src/or/rendcommon.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index 812fce9..76786e0 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -1081,6 +1081,7 @@ rend_cache_store(const char *desc, size_t desc_len, int published, "attempt to improve reliability, but it could also be an " "attempt to do a guard enumeration attack. Rejecting.", safe_str_client(query)); + rend_service_descriptor_free(parsed); return -2; } tor_snprintf(key, sizeof(key), "0%s", query); @@ -1336,6 +1337,8 @@ rend_cache_store_v2_desc_as_client(const char *desc, "attempt to improve reliability, but it could also be an " "attempt to do a guard enumeration attack. Rejecting.", safe_str_client(rend_query->onion_address)); + retval = -2; + goto err; } } else { log_info(LD_REND, "Descriptor does not contain any introduction points.");

1 0

[tor/maint-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
by nickm＠torproject.org 18 Jun '13

18 Jun '13

commit 7c4544e5a4780706dee65d2a3ff8c70000b55952 Merge: efa342f 60d633c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 18 14:45:29 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 src/or/rendcommon.c | 3 +++ 1 file changed, 3 insertions(+)

1 0