January 2012 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'feature3457-v4-nm-squashed'
by nickm＠torproject.org 11 Jan '12

11 Jan '12

commit f729e1e984896a9d6852768a8e5528932f668ac3 Merge: f371816 b5af456 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 11 12:10:14 2012 -0500 Merge branch 'feature3457-v4-nm-squashed' Conflicts: src/or/rendclient.c changes/feature3457 | 12 +++++ src/common/util.c | 20 ++++++++ src/common/util.h | 3 + src/or/circuituse.c | 48 +++++++++++++++++++- src/or/circuituse.h | 2 + src/or/control.c | 123 +++++++++++++++++++++++++++++++++++++++++++++++--- src/or/control.h | 5 ++ src/or/or.h | 7 +++ src/or/rendclient.c | 15 ++++--- src/or/rendmid.c | 10 +++-- src/or/rendservice.c | 6 +- src/test/test_util.c | 21 ++++++++- 12 files changed, 250 insertions(+), 22 deletions(-) diff --cc src/or/rendclient.c index dff8bc3,dfb52d4..1acc9ea --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@@ -350,12 -341,12 +351,13 @@@ rend_client_introduction_acked(origin_c * and tell it. */ log_info(LD_REND,"Received ack. Telling rend circ..."); - rendcirc = circuit_get_by_rend_query_and_purpose( - circ->rend_data->onion_address, CIRCUIT_PURPOSE_C_REND_READY); + rendcirc = circuit_get_ready_rend_circ_by_rend_data(circ->rend_data); if (rendcirc) { /* remember the ack */ +#ifndef NON_ANONYMOUS_MODE_ENABLED tor_assert(!(rendcirc->build_state->onehop_tunnel)); +#endif - rendcirc->_base.purpose = CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED; + circuit_change_purpose(TO_CIRCUIT(rendcirc), + CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED); /* Set timestamp_dirty, because circuit_expire_building expects * it to specify when a circuit entered the * _C_REND_READY_INTRO_ACKED state. */

1 0

[tor/master] Add clarity/typesafety wrappers for control_event_circuit_status_minor
by nickm＠torproject.org 11 Jan '12

11 Jan '12

commit c5b58df77588fd1307d248e75d360eb27023033c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 11 10:28:20 2012 -0500 Add clarity/typesafety wrappers for control_event_circuit_status_minor --- src/or/circuituse.c | 8 +++----- src/or/control.c | 32 +++++++++++++++++++++++++++++++- src/or/control.h | 8 +++++--- 3 files changed, 39 insertions(+), 9 deletions(-) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 55ec88a..442798d 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1228,8 +1228,7 @@ circuit_launch_by_extend_info(uint8_t purpose, * began. */ tor_gettimeofday(&circ->_base.timestamp_created); - control_event_circuit_status_minor(circ, CIRC_MINOR_EVENT_CANNIBALIZED, - (int)old_purpose, + control_event_circuit_cannibalized(circ, old_purpose, &old_timestamp_created); switch (purpose) { @@ -1965,9 +1964,8 @@ circuit_change_purpose(circuit_t *circ, uint8_t new_purpose) circ->purpose = new_purpose; if (CIRCUIT_IS_ORIGIN(circ)) { - control_event_circuit_status_minor(TO_ORIGIN_CIRCUIT(circ), - CIRC_MINOR_EVENT_PURPOSE_CHANGED, - (int)old_purpose, NULL); + control_event_circuit_purpose_changed(TO_ORIGIN_CIRCUIT(circ), + old_purpose); } } diff --git a/src/or/control.c b/src/or/control.c index 9cbb8cd..e15adbd 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -3376,7 +3376,7 @@ control_event_circuit_status(origin_circuit_t *circ, circuit_status_event_t tp, /** Something minor has happened to circuit circ: tell any * interested control connections. */ -int +static int control_event_circuit_status_minor(origin_circuit_t *circ, circuit_status_minor_event_t e, int purpose, const struct timeval *tv) @@ -3444,6 +3444,36 @@ control_event_circuit_status_minor(origin_circuit_t *circ, return 0; } +/** + * circ has changed its purpose from old_purpose: tell any + * interested controllers. + */ +int +control_event_circuit_purpose_changed(origin_circuit_t *circ, + int old_purpose) +{ + return control_event_circuit_status_minor(circ, + CIRC_MINOR_EVENT_PURPOSE_CHANGED, + old_purpose, + NULL); +} + +/** + * circ has changed its purpose from old_purpose, and its + * created-time from old_tv_created: tell any interested controllers. + */ +int +control_event_circuit_cannibalized(origin_circuit_t *circ, + int old_purpose, + const struct timeval *old_tv_created) +{ + return control_event_circuit_status_minor(circ, + CIRC_MINOR_EVENT_CANNIBALIZED, + old_purpose, + old_tv_created); +} + + /** Given an AP connection conn and a len-character buffer * buf, determine the address:port combination requested on * conn, and write it to buf. Return 0 on success, -1 on diff --git a/src/or/control.h b/src/or/control.h index d7127f4..7af4449 100644 --- a/src/or/control.h +++ b/src/or/control.h @@ -37,9 +37,11 @@ int control_event_is_interesting(int event); int control_event_circuit_status(origin_circuit_t *circ, circuit_status_event_t e, int reason); -int control_event_circuit_status_minor(origin_circuit_t *circ, - circuit_status_minor_event_t e, - int purpose, const struct timeval *tv); +int control_event_circuit_purpose_changed(origin_circuit_t *circ, + int old_purpose); +int control_event_circuit_cannibalized(origin_circuit_t *circ, + int old_purpose, + const struct timeval *old_tv_created); int control_event_stream_status(entry_connection_t *conn, stream_status_event_t e, int reason);

1 0

r25302: {website} Active arm development has stopped, noting low activity (website/trunk/getinvolved/en)
by Damian Johnson 11 Jan '12

11 Jan '12

Author: atagar Date: 2012-01-11 16:59:44 +0000 (Wed, 11 Jan 2012) New Revision: 25302 Modified: website/trunk/getinvolved/en/volunteer.wml Log: Active arm development has stopped, noting low activity Modified: website/trunk/getinvolved/en/volunteer.wml =================================================================== --- website/trunk/getinvolved/en/volunteer.wml 2012-01-11 15:15:16 UTC (rev 25301) +++ website/trunk/getinvolved/en/volunteer.wml 2012-01-11 16:59:44 UTC (rev 25302) @@ -141,7 +141,7 @@ <td><a href="#project-arm">Arm</a></td> <td>User Interface</td> <td>Python, Curses</td> - <td>Heavy</td> + <td>Light</td> <td>atagar</td> </tr>

1 0

[tor/master] Fix a compilation warning for our bug4822 fix on 64-bit linux
by nickm＠torproject.org 11 Jan '12

11 Jan '12

commit 8d5c0e58ea19fa1bc662c23e1a7ae77d688400fc Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 11 11:06:31 2012 -0500 Fix a compilation warning for our bug4822 fix on 64-bit linux --- src/common/tortls.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/tortls.c b/src/common/tortls.c index d88a59b..e624183 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -775,8 +775,8 @@ tor_tls_context_new(crypto_pk_env_t *identity, unsigned int key_lifetime, "might otherwise be vulnerable to CVE-2011-4657 " "(compile-time version %08lx (%s); " "runtime version %08lx (%s))", - OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_TEXT, - SSLeay(), SSLeay_version(SSLEAY_VERSION)); + (unsigned long)OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_TEXT, + (unsigned long)SSLeay(), SSLeay_version(SSLEAY_VERSION)); SSL_CTX_set_options(result->ctx, SSL_OP_NO_SSLv3); }

1 0

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

11 Jan '12

commit f37181620951d2e7a13f1363386563115d628761 Merge: 53d88eb 0126150 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 11 11:07:37 2012 -0500 Merge remote-tracking branch 'origin/maint-0.2.2' src/common/tortls.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)

1 0

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

11 Jan '12

commit 0126150c2d42c028c208529caf853c0d19ec4f5f Merge: c78a314 8d5c0e5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 11 11:07:13 2012 -0500 Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2 src/common/tortls.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.2.2] Fix a compilation warning for our bug4822 fix on 64-bit linux
by nickm＠torproject.org 11 Jan '12

11 Jan '12

commit 8d5c0e58ea19fa1bc662c23e1a7ae77d688400fc Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 11 11:06:31 2012 -0500 Fix a compilation warning for our bug4822 fix on 64-bit linux --- src/common/tortls.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/tortls.c b/src/common/tortls.c index d88a59b..e624183 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -775,8 +775,8 @@ tor_tls_context_new(crypto_pk_env_t *identity, unsigned int key_lifetime, "might otherwise be vulnerable to CVE-2011-4657 " "(compile-time version %08lx (%s); " "runtime version %08lx (%s))", - OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_TEXT, - SSLeay(), SSLeay_version(SSLEAY_VERSION)); + (unsigned long)OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_TEXT, + (unsigned long)SSLeay(), SSLeay_version(SSLEAY_VERSION)); SSL_CTX_set_options(result->ctx, SSL_OP_NO_SSLv3); }

1 0

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

11 Jan '12

commit 0126150c2d42c028c208529caf853c0d19ec4f5f Merge: c78a314 8d5c0e5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 11 11:07:13 2012 -0500 Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2 src/common/tortls.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.2.1] Fix a compilation warning for our bug4822 fix on 64-bit linux
by nickm＠torproject.org 11 Jan '12

11 Jan '12

commit 8d5c0e58ea19fa1bc662c23e1a7ae77d688400fc Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 11 11:06:31 2012 -0500 Fix a compilation warning for our bug4822 fix on 64-bit linux --- src/common/tortls.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/tortls.c b/src/common/tortls.c index d88a59b..e624183 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -775,8 +775,8 @@ tor_tls_context_new(crypto_pk_env_t *identity, unsigned int key_lifetime, "might otherwise be vulnerable to CVE-2011-4657 " "(compile-time version %08lx (%s); " "runtime version %08lx (%s))", - OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_TEXT, - SSLeay(), SSLeay_version(SSLEAY_VERSION)); + (unsigned long)OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_TEXT, + (unsigned long)SSLeay(), SSLeay_version(SSLEAY_VERSION)); SSL_CTX_set_options(result->ctx, SSL_OP_NO_SSLv3); }

1 0

r25301: {website} add a new mirror, refresh the mirrors table. (in website/trunk: . include)
by Andrew Lewman 11 Jan '12

11 Jan '12

Author: phobos Date: 2012-01-11 15:15:16 +0000 (Wed, 11 Jan 2012) New Revision: 25301 Modified: website/trunk/include/mirrors-table.wmi website/trunk/update-mirrors.pl Log: add a new mirror, refresh the mirrors table. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2012-01-11 15:04:41 UTC (rev 25300) +++ website/trunk/include/mirrors-table.wmi 2012-01-11 15:15:16 UTC (rev 25301) @@ -3,6 +3,23 @@ <td>NL</td> + <td>Amorphis</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.amorphis.eu/dist/">http</a></td> + <td><a href="http://tor.amorphis.eu/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>NL</td> + <td>torproject.nl</td> <td>Up to date</td> @@ -35,15 +52,15 @@ <tr> - <td>EE</td> + <td>DK</td> - <td>CyberSIDE</td> + <td>Zentrum der Gesundheit</td> <td>Up to date</td> <td> - </td> - <td><a href="http://cyberside.net.ee/tor/">http</a></td> - <td><a href="http://cyberside.planet.ee/tor/">http</a></td> + <td><a href="http://tor.idnr.ws/dist/">http</a></td> + <td><a href="http://tor.idnr.ws/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -52,6 +69,23 @@ <tr> + <td>IS</td> + + <td>torproject.is</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://torproject.is/dist/">http</a></td> + <td><a href="http://torproject.is/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>US</td> <td>BarkerJr</td> @@ -120,23 +154,6 @@ <tr> - <td>AT</td> - - <td></td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.mirror.reisenb.at/dist/">http</a></td> - <td><a href="http://tor.mirror.reisenb.at/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>LT</td> <td></td> @@ -290,19 +307,19 @@ <tr> - <td>US</td> + <td>DE</td> - <td>NW Linux</td> + <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.nwlinux.us/dist/">http</a></td> - <td><a href="http://torproject.nwlinux.us/">http</a></td> + <td><a href="http://tor.borgmann.tv/dist/">http</a></td> + <td><a href="http://tor.borgmann.tv/">http</a></td> <td> - </td> <td> - </td> <td> - </td> - <td><a href="rsync://nwlinux.us/tor-web">rsync</a></td> + <td> - </td> </tr> <tr> @@ -375,32 +392,32 @@ <tr> - <td>DE</td> + <td>IS</td> - <td>[[:bbs:]]</td> + <td>TheOnionRouter</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.blingblingsquad.net/dist">http</a></td> - <td><a href="http://tor.blingblingsquad.net/">http</a></td> - <td><a href="https://tor.blingblingsquad.net/dist">https</a></td> - <td><a href="https://tor.blingblingsquad.net/">https</a></td> + <td><a href="http://theonionrouter.com/dist/">http</a></td> + <td><a href="http://theonionrouter.com/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>INT</td> + <td>SE</td> - <td>CoralCDN</td> + <td>homosu</td> <td>Up to date</td> <td> - </td> - <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> - <td><a href="http://www.torproject.org.nyud.net/">http</a></td> + <td><a href="http://tor.homosu.net/dist/">http</a></td> + <td><a href="http://tor.homosu.net/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -409,32 +426,32 @@ <tr> - <td>IS</td> + <td>DE</td> - <td>crypto.is</td> + <td>[[:bbs:]]</td> <td>Up to date</td> <td> - </td> - <td><a href="https://torproject.crypto.is/dist/">http</a></td> - <td><a href="https://torproject.crypto.is/">http</a></td> - <td><a href="https://torproject.crypto.is/dist/">https</a></td> - <td><a href="https://torproject.crypto.is/">https</a></td> + <td><a href="http://tor.blingblingsquad.net/dist">http</a></td> + <td><a href="http://tor.blingblingsquad.net/">http</a></td> + <td><a href="https://tor.blingblingsquad.net/dist">https</a></td> + <td><a href="https://tor.blingblingsquad.net/">https</a></td> <td> - </td> <td> - </td> </tr> <tr> - <td>NL</td> + <td>INT</td> - <td>Amorphis</td> + <td>CoralCDN</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.amorphis.eu/dist/">http</a></td> - <td><a href="http://tor.amorphis.eu/">http</a></td> + <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> + <td><a href="http://www.torproject.org.nyud.net/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -443,49 +460,32 @@ <tr> - <td>DK</td> - - <td>Zentrum der Gesundheit</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.idnr.ws/dist/">http</a></td> - <td><a href="http://tor.idnr.ws/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>IS</td> - <td>torproject.is</td> + <td>crypto.is</td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.is/dist/">http</a></td> - <td><a href="http://torproject.is/">http</a></td> + <td><a href="https://torproject.crypto.is/dist/">http</a></td> + <td><a href="https://torproject.crypto.is/">http</a></td> + <td><a href="https://torproject.crypto.is/dist/">https</a></td> + <td><a href="https://torproject.crypto.is/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>IS</td> + <td>EE</td> - <td>TheOnionRouter</td> + <td>CyberSIDE</td> <td>Up to date</td> <td> - </td> - <td><a href="http://theonionrouter.com/dist/">http</a></td> - <td><a href="http://theonionrouter.com/">http</a></td> + <td><a href="http://cyberside.net.ee/tor/">http</a></td> + <td><a href="http://cyberside.planet.ee/tor/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -494,19 +494,19 @@ <tr> - <td>SE</td> + <td>DE</td> - <td>homosu</td> + <td>torservers</td> - <td>Up to date</td> + <td>Out of date</td> <td> - </td> - <td><a href="http://tor.homosu.net/dist/">http</a></td> - <td><a href="http://tor.homosu.net/">http</a></td> + <td><a href="http://www.torservers.net/mirrors/torproject.org/dist/">http</a></td> + <td><a href="http://www.torservers.net/mirrors/torproject.org/">http</a></td> + <td><a href="https://www.torservers.net/mirrors/torproject.org/dist/">https</a></td> + <td><a href="https://www.torservers.net/mirrors/torproject.org/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> @@ -596,32 +596,32 @@ <tr> - <td>DE</td> + <td>IR</td> - <td>torservers</td> + <td>Ninjas</td> <td>Unknown</td> <td> - </td> - <td><a href="http://www.torservers.net/mirrors/torproject.org/dist/">http</a></td> - <td><a href="http://www.torservers.net/mirrors/torproject.org/">http</a></td> - <td><a href="https://www.torservers.net/mirrors/torproject.org/dist/">https</a></td> - <td><a href="https://www.torservers.net/mirrors/torproject.org/">https</a></td> + <td><a href="http://onion.anonymo.us.org/dist/">http</a></td> + <td><a href="http://onion.anonymo.us.org/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>IR</td> + <td>AT</td> - <td>Ninjas</td> + <td></td> <td>Unknown</td> <td> - </td> - <td><a href="http://onion.anonymo.us.org/dist/">http</a></td> - <td><a href="http://onion.anonymo.us.org/">http</a></td> + <td><a href="http://tor.mirror.reisenb.at/dist/">http</a></td> + <td><a href="http://tor.mirror.reisenb.at/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -647,6 +647,23 @@ <tr> + <td>US</td> + + <td>NW Linux</td> + + <td>Unknown</td> + + <td> - </td> + <td><a href="http://torproject.nwlinux.us/dist/">http</a></td> + <td><a href="http://torproject.nwlinux.us/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td><a href="rsync://nwlinux.us/tor-web">rsync</a></td> +</tr> + +<tr> + <td>NL</td> <td></td> Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2012-01-11 15:04:41 UTC (rev 25300) +++ website/trunk/update-mirrors.pl 2012-01-11 15:15:16 UTC (rev 25301) @@ -821,6 +821,24 @@ httpsDistMirror => "https://tor.myrl.net/dist/", rsyncDistMirror => "", hiddenServiceMirror => "", + }, + mirror050 => { + adminContact => "", + orgName => "", + isoCC => "DE", + subRegion => "", + region => "DE", + ipv4 => "True", + ipv6 => "False", + loadBalanced => "No", + httpWebsiteMirror => "http://tor.borgmann.tv/", + httpsWebsiteMirror => "", + rsyncWebsiteMirror => "", + ftpWebsiteMirror => "", + httpDistMirror => "http://tor.borgmann.tv/dist/", + httpsDistMirror => "", + rsyncDistMirror => "", + hiddenServiceMirror => "", } );

1 0