tor-commits

tor-commits@lists.torproject.org

1 participants
212437 discussions

[tor/release-0.2.2] Merge branch 'bug3135' into maint-0.2.1
by arma＠torproject.org 14 May '11

14 May '11

commit d1c7f65a8e76b594c63bf23baf7fb6c19ba44c00 Merge: e7b10e5 13847b8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 11 22:49:44 2011 -0400 Merge branch 'bug3135' into maint-0.2.1 changes/bug3135 | 6 ++++++ src/or/config.c | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-)

1 0

[tor/release-0.2.2] Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
by arma＠torproject.org 14 May '11

14 May '11

commit 8057b7363ecb3fdc6dcd41d8f975bb50ef1bf6ea Merge: 7206d78 d1c7f65 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 11 22:52:26 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2 changes/bug3135 | 6 ++++++ src/or/config.c | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-)

1 0

[tor/release-0.2.2] Clean up a formatting issue on the manpge; bug3154.
by arma＠torproject.org 14 May '11

14 May '11

commit 2c88dd7f95604f445f05976dd2d34847e065349f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 12 11:36:20 2011 -0400 Clean up a formatting issue on the manpge; bug3154. --- doc/tor.1.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 00d5066..fb4b3f9 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -325,7 +325,7 @@ Other options can be specified either on the command-line (--option **Log** **[**__domain__,...**]**__minSeverity__[-__maxSeverity__] ... **file** __FILENAME__ + -**Log** **[**__domain__,...**]**__minSeverity__[-__maxSeverity__] ... **stderr**|**stdout**|**syslog** :: +**Log** **[**__domain__,...**]**__minSeverity__[-__maxSeverity__] ... **stderr**|**stdout**|**syslog**:: As above, but select messages by range of log severity __and__ by a set of "logging domains". Each logging domain corresponds to an area of functionality inside Tor. You can specify any number of severity ranges

1 0

[tor/release-0.2.2] Merge branch 'bug1352' into maint-0.2.2
by arma＠torproject.org 14 May '11

14 May '11

commit b47f574c1e27b8665e9e2658409645a3831e7aa4 Merge: 8057b73 bcdffc0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 12 00:14:10 2011 -0400 Merge branch 'bug1352' into maint-0.2.2 changes/bug1352 | 4 ++++ src/or/directory.c | 24 +++++++++++++++--------- 2 files changed, 19 insertions(+), 9 deletions(-)

1 0

[tor/release-0.2.2] Unmap microdesc cache before replacing it.
by arma＠torproject.org 14 May '11

14 May '11

commit bdff7e3299d78cd2f7aa4a31e5f57c1aeef5ffa1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 12 11:19:52 2011 -0400 Unmap microdesc cache before replacing it. If we do a replace-then-munmap, windows will never actually rewrite the microdesc cache. Found by wanoskarnet; bugfix on 0.2.2.6-alpha. --- changes/md_cache_replace | 6 ++++++ src/or/microdesc.c | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/changes/md_cache_replace b/changes/md_cache_replace new file mode 100644 index 0000000..88e029c --- /dev/null +++ b/changes/md_cache_replace @@ -0,0 +1,6 @@ + o Minor bugfixes + - Avoid a bug that would keep us from replacing a microdescriptor + cache on Windows. (We would try to replace the file while still + holding it open. That's fine on Unix, but Windows doesn't let us + do that.) Bugfix on 0.2.2.6-alpha; bug found by wanoskarnet. + diff --git a/src/or/microdesc.c b/src/or/microdesc.c index 5740c40..1554aca 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -399,10 +399,11 @@ microdesc_cache_rebuild(microdesc_cache_t *cache, int force) smartlist_add(wrote, md); } - finish_writing_to_file(open_file); /*XXX Check me.*/ - if (cache->cache_content) tor_munmap_file(cache->cache_content); + + finish_writing_to_file(open_file); /*XXX Check me.*/ + cache->cache_content = tor_mmap_file(cache->cache_fname); if (!cache->cache_content && smartlist_len(wrote)) {

1 0

[tor/release-0.2.2] Fixes ticket #2503
by arma＠torproject.org 14 May '11

14 May '11

commit 42fcf059d2706d43daba2883274d26b8312e2e43 Author: mikey99 <e_zine99(a)yahoo.com> Date: Thu May 12 17:33:09 2011 -0400 Fixes ticket #2503 HTTPS error code 403 is now reported as: "The https proxy refused to allow connection". Used a switch statement for additional error codes to be explained in the future. --- src/or/connection.c | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index fc2097f..eaae791 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1504,10 +1504,20 @@ connection_read_https_proxy_response(connection_t *conn) return 1; } /* else, bad news on the status code */ - log_warn(LD_NET, - "The https proxy sent back an unexpected status code %d (%s). " - "Closing.", - status_code, escaped(reason)); + switch (status_code) { + case 403: + log_warn(LD_NET, + "The https proxy refused to allow connection to %s " + "(status code %d, %s). Closing.", + conn->address, status_code, escaped(reason)); + break; + default: + log_warn(LD_NET, + "The https proxy sent back an unexpected status code %d (%s). " + "Closing.", + status_code, escaped(reason)); + break; + } tor_free(reason); return -1; }

1 0

[tor/release-0.2.2] Add changes file for bug2503
by arma＠torproject.org 14 May '11

14 May '11

commit 379de3d10acd45f02aa6c64f54de9b7faa634df5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 12 18:49:28 2011 -0400 Add changes file for bug2503 --- changes/bug2503 | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/changes/bug2503 b/changes/bug2503 new file mode 100644 index 0000000..50b8bf5 --- /dev/null +++ b/changes/bug2503 @@ -0,0 +1,4 @@ + o Minor features: + - When an HTTPS proxy reports "403 Forbidden", we now explain + what it means rather than calling it an unexpected status code. + Closes bug 2503. Patch from "mikey".

1 0

[tor/release-0.2.2] Merge remote-tracking branch 'public/bug3122_memcmp_squashed' into maint-0.2.1
by arma＠torproject.org 14 May '11

14 May '11

1 0

[tor/release-0.2.2] Merge remote-tracking branch 'public/bug3122_memcmp_022' into maint-0.2.2
by arma＠torproject.org 14 May '11

14 May '11

1 0

[tor/release-0.2.2] Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
by arma＠torproject.org 14 May '11

14 May '11

commit 98870f2eada31ee7efca62ab7adf98cb843e2937 Merge: 59a6df8 1f67827 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 12 19:25:21 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits