- tor-commits - lists.torproject.org

[tor/maint-0.2.2] Merge branch 'bug5346_squashed' into maint-0.2.2
by nickm＠torproject.org 16 May '12

16 May '12

commit dd749798a436688cbbe3fc23fe6d4f5041a3e015 Merge: 3ed4c5d 679aa93 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 16 12:15:35 2012 -0400 Merge branch 'bug5346_squashed' into maint-0.2.2 changes/bug5346 | 8 +++++++ src/common/util.c | 26 +++++++++++++++--------- src/test/test_util.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 77 insertions(+), 10 deletions(-)

1 0

[tor/master] In connection_ap_handshake_process_socks(), mark the socks request as finished if a reply is send after a parse error
by nickm＠torproject.org 16 May '12

16 May '12

commit 2888644a9f268683ab70cc972b36efbbbe466a25 Author: Fabian Keil <fk(a)fabiankeil.de> Date: Sun Sep 25 16:32:43 2011 +0200 In connection_ap_handshake_process_socks(), mark the socks request as finished if a reply is send after a parse error Silences the log message: [warn] {BUG} _connection_mark_unattached_ap(): Bug: stream (marked at connection_edge.c:2224) sending two socks replies? after the client triggered the "Tor is not an HTTP Proxy" response. No additional socks reply was sent, though. --- src/or/connection_edge.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 3b053c7..ca4bf3f 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -2319,6 +2319,11 @@ connection_ap_handshake_process_socks(entry_connection_t *conn) connection_write_to_buf((const char*)socks->reply, socks->replylen, base_conn); socks->replylen = 0; + if (sockshere == -1) { + /* An invalid request just got a reply, no additional + * one is necessary. */ + socks->has_finished = 1; + } } if (sockshere == 0) {

1 0

[tor/master] Add changes file for bug 4108
by nickm＠torproject.org 16 May '12

16 May '12

commit 70ffd3bc20d2ab4ce9e3f4e57b3728e644d584ce Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 16 11:44:12 2012 -0400 Add changes file for bug 4108 --- changes/bug4108 | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/changes/bug4108 b/changes/bug4108 new file mode 100644 index 0000000..6ef451a --- /dev/null +++ b/changes/bug4108 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Avoid a "double-reply" warning when replying to a SOCKS request + with a parse error. Patch from Fabian Keil. Fix for bug 4108; + bugfix on 0.2.3.4-alpha.

1 0

[tor/master] Improve our documentation for the NT Service command line options
by nickm＠torproject.org 16 May '12

16 May '12

commit dc60b5d6a725955847082a24ff0b65d183e60c18 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 11 13:10:35 2012 -0400 Improve our documentation for the NT Service command line options We explain the --options option, document --nt-service as an internal-use-only thing (which it is), fix a URL, and generally improve the prose. --- changes/bug3964 | 4 ++++ doc/tor.1.txt | 12 +++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/changes/bug3964 b/changes/bug3964 new file mode 100644 index 0000000..34cad50 --- /dev/null +++ b/changes/bug3964 @@ -0,0 +1,4 @@ + o Documentation fixes: + - Improve the manual's documentation for the NT Service command-line + options. Addresses bug 3964. + diff --git a/doc/tor.1.txt b/doc/tor.1.txt index e73377b..ff46472 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -45,10 +45,16 @@ OPTIONS **--verify-config**:: Verify the configuration file is valid. +**--service install** [**--options** __command-line options__]:: + Install an instance of Tor as a Windows service, with the provided + command-line options. Current instructions can be found at + https://trac.torproject.org/projects/tor/wiki/doc/TorFAQ#HowdoIrunmyTorrela… + +**--service** **remove**|**start**|**stop**:: + Remove, start, or stop a configured Tor Windows service. + **--nt-service**:: - **--service [install|remove|start|stop]** Manage the Tor Windows - NT/2000/XP service. Current instructions can be found at - https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService + Used internally to implement a Windows service. **--list-torrc-options**:: List all valid options.

1 0

[tor/master] Merge remote-tracking branch 'public/bug3964'
by nickm＠torproject.org 16 May '12

16 May '12

commit 82ce43a70676013eb4b694465a826b9d469905aa Merge: 2cdd631 dc60b5d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 16 11:33:52 2012 -0400 Merge remote-tracking branch 'public/bug3964' changes/bug3964 | 4 ++++ doc/tor.1.txt | 12 +++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-)

1 0

[tor/master] Correct documentation for remove_obsolete_entry_guards.
by nickm＠torproject.org 16 May '12

16 May '12

commit a6cb07bd9e332205d55010c8386746096f78fc91 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 16 11:18:21 2012 -0400 Correct documentation for remove_obsolete_entry_guards. --- src/or/circuitbuild.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 3b82ed7..19be77e 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -3737,7 +3737,9 @@ entry_guard_free(entry_guard_t *e) /** Remove any entry guard which was selected by an unknown version of Tor, * or which was selected by a version of Tor that's known to select - * entry guards badly. */ + * entry guards badly, or which was selected more 2 months ago. */ +/* XXXX The "obsolete guards" and "chosen long ago guards" things should + * probably be different functions. */ static int remove_obsolete_entry_guards(time_t now) {

1 0

[tor/master] Remove over-two-months-old entry guards even while running.
by nickm＠torproject.org 16 May '12

16 May '12

commit f89de0a79fe02727d40a051eba0e96f7324e68ab Author: Roger Dingledine <arma(a)torproject.org> Date: Wed May 16 11:28:36 2012 -0400 Remove over-two-months-old entry guards even while running. Previously, we only did this check at startup, which could lead to us holding a guard indefinitely, and give weird results. Fixes bug 5380; bugfix on 0.2.1.14-rc. (Patch by Roger; changes file and commit message by Nick) --- changes/bug5380 | 5 +++++ src/or/circuitbuild.c | 2 ++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/changes/bug5380 b/changes/bug5380 new file mode 100644 index 0000000..4bb17bc --- /dev/null +++ b/changes/bug5380 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Check our entry guards for having been picked too long ago when + we get a new consensus. (Previously, we only did this check at + startup, which could lead to us holding a guard indefinitely, + and give weird results.) Fixes bug 5380; bugfix on 0.2.1.14-rc. diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 19be77e..403f65f 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -3868,6 +3868,8 @@ entry_guards_compute_status(const or_options_t *options, time_t now) if (remove_dead_entry_guards(now)) changed = 1; + if (remove_obsolete_entry_guards(now)) + changed = 1; if (changed) { SMARTLIST_FOREACH_BEGIN(entry_guards, entry_guard_t *, entry) {

1 0

[tor/master] Merge branch 'bug5380'
by nickm＠torproject.org 16 May '12

16 May '12

commit 2cdd631f5ca93e8bed5ad741881d4b332a81ebc3 Merge: 517b9c6 f89de0a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 16 11:31:40 2012 -0400 Merge branch 'bug5380' changes/bug5380 | 5 +++++ src/or/circuitbuild.c | 6 +++++- 2 files changed, 10 insertions(+), 1 deletions(-)

1 0

[tor/master] Exits don't need to fetch certs for unknown authorities
by nickm＠torproject.org 16 May '12

16 May '12

commit 5193752ca88849878a0843cec1e81c6b4b05e550 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 30 15:20:06 2012 -0400 Exits don't need to fetch certs for unknown authorities When we started RefuseUnknownExits back in 0.2.2.11-alpha, we started making exits act like they cache directory info (since they need an up-to-date idea of who is really a router). But this included fetching needless (unrecognized) authorities' certs, which doesn't make any sense for them. This is related to, but not necessarily the same as, the issue that Ian reported for bug #2297. (This patch is based on a patch from a user who I believe has asked not to be named. If I'm wrong about that, please add the appropriate name onto the changelog.) --- changes/bug2297-related | 6 ++++++ src/or/dirserv.c | 9 +++++++++ src/or/dirserv.h | 1 + src/or/routerlist.c | 4 ++-- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/changes/bug2297-related b/changes/bug2297-related new file mode 100644 index 0000000..3d9af11 --- /dev/null +++ b/changes/bug2297-related @@ -0,0 +1,6 @@ + o Minor bugfixes: + - Exit nodes don't need to fetch certificates for authorities that + they don't recognize; only directory authorities, bridges, and + caches need to do that. Fix related to bug 2297; bugfix on + 0.2.2.11-alpha. + diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 11f235c..898d9f4 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1252,6 +1252,15 @@ directory_caches_v2_dir_info(const or_options_t *options) return options->DirPort != NULL; } +/** Return true iff we want to fetch and keep certificates for authorities + * that we don't acknowledge as aurthorities ourself. + */ +int +directory_caches_unknown_auth_certs(const or_options_t *options) +{ + return options->DirPort || options->BridgeRelay; +} + /** Return 1 if we want to keep descriptors, networkstatuses, etc around * and we're willing to serve them to others. Else return 0. */ diff --git a/src/or/dirserv.h b/src/or/dirserv.h index fc48e48..3ff0815 100644 --- a/src/or/dirserv.h +++ b/src/or/dirserv.h @@ -76,6 +76,7 @@ int directory_fetches_dir_info_early(const or_options_t *options); int directory_fetches_dir_info_later(const or_options_t *options); int directory_caches_v2_dir_info(const or_options_t *options); #define directory_caches_v1_dir_info(o) directory_caches_v2_dir_info(o) +int directory_caches_unknown_auth_certs(const or_options_t *options); int directory_caches_dir_info(const or_options_t *options); int directory_permits_begindir_requests(const or_options_t *options); int directory_permits_controller_requests(const or_options_t *options); diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 160f340..f549549 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -229,7 +229,7 @@ trusted_dirs_load_certs_from_string(const char *contents, int from_store, "signing key %s", from_store ? "cached" : "downloaded", ds->nickname, hex_str(cert->signing_key_digest,DIGEST_LEN)); } else { - int adding = directory_caches_dir_info(get_options()); + int adding = directory_caches_unknown_auth_certs(get_options()); log_info(LD_DIR, "%s %s certificate for unrecognized directory " "authority with signing key %s", adding ? "Adding" : "Not adding", @@ -480,7 +480,7 @@ authority_certs_fetch_missing(networkstatus_t *status, time_t now) smartlist_t *missing_digests; char *resource = NULL; cert_list_t *cl; - const int cache = directory_caches_dir_info(get_options()); + const int cache = directory_caches_unknown_auth_certs(get_options()); if (should_delay_dir_fetches(get_options())) return;

1 0

[tor/master] Merge remote-tracking branch 'public/bug2297'
by nickm＠torproject.org 16 May '12

16 May '12

commit 517b9c602a9e5e8c60849892a426526e803ef412 Merge: a925fc9 5193752 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 16 11:14:00 2012 -0400 Merge remote-tracking branch 'public/bug2297' changes/bug2297-related | 6 ++++++ src/or/dirserv.c | 9 +++++++++ src/or/dirserv.h | 1 + src/or/routerlist.c | 4 ++-- 4 files changed, 18 insertions(+), 2 deletions(-)

1 0