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

[tor/master] Document lifespan of return values of the _remote_descr() funcs
by nickm＠torproject.org 19 Oct '12

19 Oct '12

commit cb9d1237641290dc92b11540b96db036748429be Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 17 11:29:37 2012 -0400 Document lifespan of return values of the _remote_descr() funcs --- src/or/channel.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/or/channel.c b/src/or/channel.c index 13aa007..3acb509 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -3475,8 +3475,10 @@ channel_listener_dump_transport_statistics(channel_listener_t *chan_l, * This function return a test provided by the lower layer of the remote * endpoint for this channel; it should specify the actual address connected * to/from. + * + * Subsequent calls to channel_get_{actual,canonical}_remote_{address,descr} + * may invalidate the return value from this function. */ - const char * channel_get_actual_remote_descr(channel_t *chan) { @@ -3487,7 +3489,12 @@ channel_get_actual_remote_descr(channel_t *chan) return chan->get_remote_descr(chan, GRD_FLAG_ORIGINAL); } -/** DOCDOC */ +/** + * Return the text address of the remote endpoint. + * + * Subsequent calls to channel_get_{actual,canonical}_remote_{address,descr} + * may invalidate the return value from this function. + */ const char * channel_get_actual_remote_address(channel_t *chan) { @@ -3501,8 +3508,10 @@ channel_get_actual_remote_address(channel_t *chan) * This function return a test provided by the lower layer of the remote * endpoint for this channel; it should use the known canonical address for * this OR's identity digest if possible. + * + * Subsequent calls to channel_get_{actual,canonical}_remote_{address,descr} + * may invalidate the return value from this function. */ - const char * channel_get_canonical_remote_descr(channel_t *chan) {

1 0

[tor/master] Factor out common parts of channel_tls_connect() and channel_tls_handle_incoming(); fixes get_remote_addr problem with incoming connections for bug 7112
by nickm＠torproject.org 19 Oct '12

19 Oct '12

commit 981f25a73ad5ff5de1147e6f9bc3cb7c55cda71b Author: Andrea Shepard <andrea(a)torproject.org> Date: Thu Oct 18 18:08:35 2012 -0700 Factor out common parts of channel_tls_connect() and channel_tls_handle_incoming(); fixes get_remote_addr problem with incoming connections for bug 7112 --- src/or/channeltls.c | 69 ++++++++++++++++++++++++++------------------------ 1 files changed, 36 insertions(+), 33 deletions(-) diff --git a/src/or/channeltls.c b/src/or/channeltls.c index a7ac83f..af0f096 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -46,6 +46,9 @@ uint64_t stats_n_authorize_cells_processed = 0; /** Active listener, if any */ channel_listener_t *channel_tls_listener = NULL; +/* Utility function declarations */ +static void channel_tls_common_init(channel_tls_t *tlschan); + /* channel_tls_t method declarations */ static void channel_tls_close_method(channel_t *chan); @@ -92,19 +95,18 @@ static int enter_v3_handshake_with_cell(var_cell_t *cell, channel_tls_t *tlschan); /** - * Start a new TLS channel - * - * Launch a new OR connection to addr:port and expect to - * handshake with an OR with identity digest id_digest, and wrap - * it in a channel_tls_t. + * Do parts of channel_tls_t initialization common to channel_tls_connect() + * and channel_tls_handle_incoming(). */ -channel_t * -channel_tls_connect(const tor_addr_t *addr, uint16_t port, - const char *id_digest) +static void +channel_tls_common_init(channel_tls_t *tlschan) { - channel_tls_t *tlschan = tor_malloc_zero(sizeof(*tlschan)); - channel_t *chan = &(tlschan->base_); + channel_t *chan; + + tor_assert(tlschan); + + chan = &(tlschan->base_); channel_init(chan); chan->magic = TLS_CHAN_MAGIC; chan->state = CHANNEL_STATE_OPENING; @@ -120,6 +122,29 @@ channel_tls_connect(const tor_addr_t *addr, uint16_t port, chan->write_packed_cell = channel_tls_write_packed_cell_method; chan->write_var_cell = channel_tls_write_var_cell_method; + chan->cmux = circuitmux_alloc(); + if (cell_ewma_enabled()) { + circuitmux_set_policy(chan->cmux, &ewma_policy); + } +} + +/** + * Start a new TLS channel + * + * Launch a new OR connection to addr:port and expect to + * handshake with an OR with identity digest id_digest, and wrap + * it in a channel_tls_t. + */ + +channel_t * +channel_tls_connect(const tor_addr_t *addr, uint16_t port, + const char *id_digest) +{ + channel_tls_t *tlschan = tor_malloc_zero(sizeof(*tlschan)); + channel_t *chan = &(tlschan->base_); + + channel_tls_common_init(tlschan); + log_debug(LD_CHANNEL, "In channel_tls_connect() for channel %p " "(global id " U64_FORMAT ")", @@ -129,11 +154,6 @@ channel_tls_connect(const tor_addr_t *addr, uint16_t port, if (is_local_addr(addr)) channel_mark_local(chan); channel_mark_outgoing(chan); - chan->cmux = circuitmux_alloc(); - if (cell_ewma_enabled()) { - circuitmux_set_policy(chan->cmux, &ewma_policy); - } - /* Set up or_connection stuff */ tlschan->conn = connection_or_connect(addr, port, id_digest, tlschan); /* connection_or_connect() will fill in tlschan->conn */ @@ -255,19 +275,7 @@ channel_tls_handle_incoming(or_connection_t *orconn) tor_assert(orconn); tor_assert(!(orconn->chan)); - channel_init(chan); - chan->magic = TLS_CHAN_MAGIC; - chan->state = CHANNEL_STATE_OPENING; - chan->close = channel_tls_close_method; - chan->describe_transport = channel_tls_describe_transport_method; - chan->get_remote_descr = channel_tls_get_remote_descr_method; - chan->has_queued_writes = channel_tls_has_queued_writes_method; - chan->is_canonical = channel_tls_is_canonical_method; - chan->matches_extend_info = channel_tls_matches_extend_info_method; - chan->matches_target = channel_tls_matches_target_method; - chan->write_cell = channel_tls_write_cell_method; - chan->write_packed_cell = channel_tls_write_packed_cell_method; - chan->write_var_cell = channel_tls_write_var_cell_method; + channel_tls_common_init(tlschan); /* Link the channel and orconn to each other */ tlschan->conn = orconn; @@ -276,11 +284,6 @@ channel_tls_handle_incoming(or_connection_t *orconn) if (is_local_addr(&(TO_CONN(orconn)->addr))) channel_mark_local(chan); channel_mark_incoming(chan); - chan->cmux = circuitmux_alloc(); - if (cell_ewma_enabled()) { - circuitmux_set_policy(chan->cmux, &ewma_policy); - } - /* If we got one, we should register it */ if (chan) channel_register(chan);

1 0

[flashproxy/master] Put imap_login inside the exception block with imap_loop.
by dcf＠torproject.org 18 Oct '12

18 Oct '12

commit c47aa6e56fddead101c96238e35d7037aaaff092 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Oct 18 09:44:33 2012 -0700 Put imap_login inside the exception block with imap_loop. I got an error that crashed the poller when it got disconnected and tried to reconnect: 2012-10-18 05:37:28 lost server connection: command: SELECT => socket error: EOF 2012-10-18 05:37:28 logging in as flashproxyreg.a(a)gmail.com Traceback (most recent call last): File "/usr/local/bin/facilitator-email-poller", line 358, in <module> imap = imap_login() File "/usr/local/bin/facilitator-email-poller", line 333, in imap_login imap.login(options.email_addr, email_password) File "/usr/lib/python2.6/imaplib.py", line 498, in login typ, dat = self._simple_command('LOGIN', user, self._quote(password)) File "/usr/lib/python2.6/imaplib.py", line 1060, in _simple_command return self._command_complete(name, self._command(name, *args)) File "/usr/lib/python2.6/imaplib.py", line 893, in _command_complete self._check_bye() File "/usr/lib/python2.6/imaplib.py", line 808, in _check_bye raise self.abort(bye[-1]) imaplib.abort: [UNAVAILABLE] Temporary System Error We want to reconnect in this case. The rate limiter will make sure we don't retry too fast if it is a persistent error. --- facilitator/facilitator-email-poller | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/facilitator/facilitator-email-poller b/facilitator/facilitator-email-poller index 8bb90ca..e9c5d3a 100755 --- a/facilitator/facilitator-email-poller +++ b/facilitator/facilitator-email-poller @@ -355,8 +355,8 @@ class RateLimit(object): login_limit = RateLimit() while True: - imap = imap_login() try: + imap = imap_login() imap_loop(imap) except imaplib.IMAP4.abort, e: # Try again after a disconnection.

1 0

[torbrowser/maint-2.2] bump all stable tbbs to 2.2.39-4 for updated non-crashy firefox
by erinn＠torproject.org 18 Oct '12

18 Oct '12

commit f550eda4c97664237bd78a547c7f9992664e9206 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Oct 18 08:46:44 2012 +0100 bump all stable tbbs to 2.2.39-4 for updated non-crashy firefox --- README.LINUX-2.2 | 4 ++-- README.OSX-2.2 | 4 ++-- README.WIN-2.2 | 4 ++-- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 4 ++-- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 8 ++++++++ changelog.osx-2.2 | 8 ++++++++ changelog.windows-2.2 | 8 ++++++++ 10 files changed, 35 insertions(+), 11 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index 859c854..fe79874 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -8,8 +8,8 @@ Vidalia 0.2.20 (with Qt 4.8.1) Tor 0.2.2.39 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 10.0.9esr \_ Torbutton 1.4.6.3 - |_ NoScript 2.5.7 - |_ HTTPS-Everywhere 2.2.2 + |_ NoScript 2.5.8 + |_ HTTPS-Everywhere 3.0.2 Usage ----- diff --git a/README.OSX-2.2 b/README.OSX-2.2 index 3ffefa3..9250ce2 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -8,8 +8,8 @@ Vidalia 0.2.20 (with Qt 4.8.1) Tor 0.2.2.39 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 10.0.9esr \_ Torbutton 1.4.6.3 - |_ NoScript 2.5.7 - |_ HTTPS-Everywhere 2.2.2 + |_ NoScript 2.5.8 + |_ HTTPS-Everywhere 3.0.2 Usage ----- diff --git a/README.WIN-2.2 b/README.WIN-2.2 index 3c73b5c..bbbd27f 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -8,8 +8,8 @@ Vidalia 0.2.20 (with Qt 4.8.1) Tor 0.2.2.39 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 10.0.9esr \_ Torbutton 1.4.6.3 - |_ NoScript 2.5.7 - |_ HTTPS-Everywhere 2.2.2 + |_ NoScript 2.5.8 + |_ HTTPS-Everywhere 3.0.2 Usage ----- diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 5e64cba..1d7feda 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=3 +BUILD_NUM=4 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 6325e5f..dd6154a 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=x86_64 -BUILD_NUM=3 +BUILD_NUM=4 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 6063f66..3da6032 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -14,8 +14,8 @@ FIREFOX_VER=10.0.9esr MOZBUILD_VER=1.5.1 PYMAKE_VER=87d436cd8974 TORBUTTON_VER=1.4.6.3 -NOSCRIPT_VER=2.5.7 -HTTPSEVERYWHERE_VER=2.2.2 +NOSCRIPT_VER=2.5.8 +HTTPSEVERYWHERE_VER=3.0.2 OTR_VER=3.2.0 OBFSPROXY_VER=0.1.4 diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 54b972c..cbf4451 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=3 +BUILD_NUM=4 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index 386cab3..10adc35 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.2.39-4); suite=linux + + * Update Firefox patches to prevent crashing (closes: #7128) + * Update HTTPS Everywhere to 3.0.2 + * Update NoScript to 2.5.8 + + -- Erinn Clark <erinn(a)torproject.org> Thu Oct 18 08:40:15 BST 2012 + Tor Browser Bundle (2.2.39-3); suite=linux * Update Firefox to 10.0.9esr diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index af3069a..a0cb5d0 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.2.39-4); suite=osx + + * Update Firefox patches to prevent crashing (closes: #7128) + * Update HTTPS Everywhere to 3.0.2 + * Update NoScript to 2.5.8 + + -- Erinn Clark <erinn(a)torproject.org> Thu Oct 18 08:40:10 BST 2012 + Tor Browser Bundle (2.2.39-3); suite=osx * Update Firefox to 10.0.9esr diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index 094b8d2..d3006b0 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.2.39-4); suite=windows + + * Update Firefox patches to prevent crashing (closes: #7128) + * Update HTTPS Everywhere to 3.0.2 + * Update NoScript to 2.5.8 + + -- Erinn Clark <erinn(a)torproject.org> Thu Oct 18 08:40:12 BST 2012 + Tor Browser Bundle (2.2.39-3); suite=windows * Update Firefox to 10.0.9esr

1 0

[torbrowser/master] bump stable tbbs to 2.2.39-4 for updated non-crashy firefox
by erinn＠torproject.org 18 Oct '12

18 Oct '12

commit 279edcd26f0327e98cea5278a16c99c62dbe4885 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Oct 18 08:42:07 2012 +0100 bump stable tbbs to 2.2.39-4 for updated non-crashy firefox --- README.LINUX-2.2 | 4 ++-- README.OSX-2.2 | 4 ++-- README.WIN-2.2 | 4 ++-- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 4 ++-- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 8 ++++++++ changelog.osx-2.2 | 8 ++++++++ changelog.windows-2.2 | 8 ++++++++ 10 files changed, 35 insertions(+), 11 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index 859c854..fe79874 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -8,8 +8,8 @@ Vidalia 0.2.20 (with Qt 4.8.1) Tor 0.2.2.39 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 10.0.9esr \_ Torbutton 1.4.6.3 - |_ NoScript 2.5.7 - |_ HTTPS-Everywhere 2.2.2 + |_ NoScript 2.5.8 + |_ HTTPS-Everywhere 3.0.2 Usage ----- diff --git a/README.OSX-2.2 b/README.OSX-2.2 index 3ffefa3..9250ce2 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -8,8 +8,8 @@ Vidalia 0.2.20 (with Qt 4.8.1) Tor 0.2.2.39 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 10.0.9esr \_ Torbutton 1.4.6.3 - |_ NoScript 2.5.7 - |_ HTTPS-Everywhere 2.2.2 + |_ NoScript 2.5.8 + |_ HTTPS-Everywhere 3.0.2 Usage ----- diff --git a/README.WIN-2.2 b/README.WIN-2.2 index 3c73b5c..bbbd27f 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -8,8 +8,8 @@ Vidalia 0.2.20 (with Qt 4.8.1) Tor 0.2.2.39 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 10.0.9esr \_ Torbutton 1.4.6.3 - |_ NoScript 2.5.7 - |_ HTTPS-Everywhere 2.2.2 + |_ NoScript 2.5.8 + |_ HTTPS-Everywhere 3.0.2 Usage ----- diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 5e64cba..1d7feda 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=3 +BUILD_NUM=4 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 6325e5f..dd6154a 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=x86_64 -BUILD_NUM=3 +BUILD_NUM=4 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 6063f66..3da6032 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -14,8 +14,8 @@ FIREFOX_VER=10.0.9esr MOZBUILD_VER=1.5.1 PYMAKE_VER=87d436cd8974 TORBUTTON_VER=1.4.6.3 -NOSCRIPT_VER=2.5.7 -HTTPSEVERYWHERE_VER=2.2.2 +NOSCRIPT_VER=2.5.8 +HTTPSEVERYWHERE_VER=3.0.2 OTR_VER=3.2.0 OBFSPROXY_VER=0.1.4 diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 54b972c..cbf4451 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=3 +BUILD_NUM=4 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index 386cab3..10adc35 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.2.39-4); suite=linux + + * Update Firefox patches to prevent crashing (closes: #7128) + * Update HTTPS Everywhere to 3.0.2 + * Update NoScript to 2.5.8 + + -- Erinn Clark <erinn(a)torproject.org> Thu Oct 18 08:40:15 BST 2012 + Tor Browser Bundle (2.2.39-3); suite=linux * Update Firefox to 10.0.9esr diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index af3069a..a0cb5d0 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.2.39-4); suite=osx + + * Update Firefox patches to prevent crashing (closes: #7128) + * Update HTTPS Everywhere to 3.0.2 + * Update NoScript to 2.5.8 + + -- Erinn Clark <erinn(a)torproject.org> Thu Oct 18 08:40:10 BST 2012 + Tor Browser Bundle (2.2.39-3); suite=osx * Update Firefox to 10.0.9esr diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index 094b8d2..d3006b0 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.2.39-4); suite=windows + + * Update Firefox patches to prevent crashing (closes: #7128) + * Update HTTPS Everywhere to 3.0.2 + * Update NoScript to 2.5.8 + + -- Erinn Clark <erinn(a)torproject.org> Thu Oct 18 08:40:12 BST 2012 + Tor Browser Bundle (2.2.39-3); suite=windows * Update Firefox to 10.0.9esr

1 0

[torbrowser/maint-2.3] bump stable tbbs to 2.2.39-4 for updated non-crashy firefox
by erinn＠torproject.org 18 Oct '12

18 Oct '12

commit 279edcd26f0327e98cea5278a16c99c62dbe4885 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Oct 18 08:42:07 2012 +0100 bump stable tbbs to 2.2.39-4 for updated non-crashy firefox --- README.LINUX-2.2 | 4 ++-- README.OSX-2.2 | 4 ++-- README.WIN-2.2 | 4 ++-- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 4 ++-- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 8 ++++++++ changelog.osx-2.2 | 8 ++++++++ changelog.windows-2.2 | 8 ++++++++ 10 files changed, 35 insertions(+), 11 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index 859c854..fe79874 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -8,8 +8,8 @@ Vidalia 0.2.20 (with Qt 4.8.1) Tor 0.2.2.39 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 10.0.9esr \_ Torbutton 1.4.6.3 - |_ NoScript 2.5.7 - |_ HTTPS-Everywhere 2.2.2 + |_ NoScript 2.5.8 + |_ HTTPS-Everywhere 3.0.2 Usage ----- diff --git a/README.OSX-2.2 b/README.OSX-2.2 index 3ffefa3..9250ce2 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -8,8 +8,8 @@ Vidalia 0.2.20 (with Qt 4.8.1) Tor 0.2.2.39 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 10.0.9esr \_ Torbutton 1.4.6.3 - |_ NoScript 2.5.7 - |_ HTTPS-Everywhere 2.2.2 + |_ NoScript 2.5.8 + |_ HTTPS-Everywhere 3.0.2 Usage ----- diff --git a/README.WIN-2.2 b/README.WIN-2.2 index 3c73b5c..bbbd27f 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -8,8 +8,8 @@ Vidalia 0.2.20 (with Qt 4.8.1) Tor 0.2.2.39 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 10.0.9esr \_ Torbutton 1.4.6.3 - |_ NoScript 2.5.7 - |_ HTTPS-Everywhere 2.2.2 + |_ NoScript 2.5.8 + |_ HTTPS-Everywhere 3.0.2 Usage ----- diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 5e64cba..1d7feda 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=3 +BUILD_NUM=4 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 6325e5f..dd6154a 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=x86_64 -BUILD_NUM=3 +BUILD_NUM=4 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 6063f66..3da6032 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -14,8 +14,8 @@ FIREFOX_VER=10.0.9esr MOZBUILD_VER=1.5.1 PYMAKE_VER=87d436cd8974 TORBUTTON_VER=1.4.6.3 -NOSCRIPT_VER=2.5.7 -HTTPSEVERYWHERE_VER=2.2.2 +NOSCRIPT_VER=2.5.8 +HTTPSEVERYWHERE_VER=3.0.2 OTR_VER=3.2.0 OBFSPROXY_VER=0.1.4 diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 54b972c..cbf4451 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=3 +BUILD_NUM=4 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index 386cab3..10adc35 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.2.39-4); suite=linux + + * Update Firefox patches to prevent crashing (closes: #7128) + * Update HTTPS Everywhere to 3.0.2 + * Update NoScript to 2.5.8 + + -- Erinn Clark <erinn(a)torproject.org> Thu Oct 18 08:40:15 BST 2012 + Tor Browser Bundle (2.2.39-3); suite=linux * Update Firefox to 10.0.9esr diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index af3069a..a0cb5d0 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.2.39-4); suite=osx + + * Update Firefox patches to prevent crashing (closes: #7128) + * Update HTTPS Everywhere to 3.0.2 + * Update NoScript to 2.5.8 + + -- Erinn Clark <erinn(a)torproject.org> Thu Oct 18 08:40:10 BST 2012 + Tor Browser Bundle (2.2.39-3); suite=osx * Update Firefox to 10.0.9esr diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index 094b8d2..d3006b0 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.2.39-4); suite=windows + + * Update Firefox patches to prevent crashing (closes: #7128) + * Update HTTPS Everywhere to 3.0.2 + * Update NoScript to 2.5.8 + + -- Erinn Clark <erinn(a)torproject.org> Thu Oct 18 08:40:12 BST 2012 + Tor Browser Bundle (2.2.39-3); suite=windows * Update Firefox to 10.0.9esr

1 0

[torbrowser/master] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 18 Oct '12

18 Oct '12

commit aa51199d160b836dbb46a2af705806074d498033 Merge: 8b21ddd 279edcd Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Oct 18 08:42:28 2012 +0100 Merge branch 'maint-2.2' into maint-2.3 README.LINUX-2.2 | 4 ++-- README.OSX-2.2 | 4 ++-- README.WIN-2.2 | 4 ++-- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 4 ++-- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 8 ++++++++ changelog.osx-2.2 | 8 ++++++++ changelog.windows-2.2 | 8 ++++++++ 10 files changed, 35 insertions(+), 11 deletions(-)

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 18 Oct '12

18 Oct '12

commit aa51199d160b836dbb46a2af705806074d498033 Merge: 8b21ddd 279edcd Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Oct 18 08:42:28 2012 +0100 Merge branch 'maint-2.2' into maint-2.3 README.LINUX-2.2 | 4 ++-- README.OSX-2.2 | 4 ++-- README.WIN-2.2 | 4 ++-- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 4 ++-- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 8 ++++++++ changelog.osx-2.2 | 8 ++++++++ changelog.windows-2.2 | 8 ++++++++ 10 files changed, 35 insertions(+), 11 deletions(-)

1 0

[torspec/master] Document consensus paramters that changed defaults.
by nickm＠torproject.org 18 Oct '12

18 Oct '12

commit 3c568874c3a4389108c59681acbc05433638f5e1 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Oct 16 18:29:09 2012 -0700 Document consensus paramters that changed defaults. Also clarify the timeout decision. --- proposals/209-path-bias-tuning.txt | 33 ++++++++++++++++++++++----------- 1 files changed, 22 insertions(+), 11 deletions(-) diff --git a/proposals/209-path-bias-tuning.txt b/proposals/209-path-bias-tuning.txt index 25ee9de..926f561 100644 --- a/proposals/209-path-bias-tuning.txt +++ b/proposals/209-path-bias-tuning.txt @@ -59,8 +59,11 @@ Design Description Circuit build timeouts are only counted as path failures if the circuit fails to complete before the 95% "right-censored" (aka "MEASUREMENT_EXPIRED") timeout interval, not the 80% timeout - condition. See 2.4.1 of path-spec for further details on circuit - timeout calculations. + condition[5]. This was done based on the assumption that destructive + cryptographic tagging is the primary vector for the path bias attack, + until such time as Tor's circuit crypto can be upgraded. Therefore, + being more lenient with timeout makes us more resilient to network + conditions. To ensure correctness, checks are performed to ensure that we do not count successes without also counting the first hop (see @@ -199,16 +202,12 @@ Security Considerations: Targeted Failure Attacks rate to 51% for the 10% compromise case, or 34% for the 20% compromise case. - Since both conditions would elicit notices and/or warns from all + Since both conditions would elicit notices and/or warns from *all* clients, this attack should be detectable. It can also be detected through the bandwidth authorities (who could possibly even set pathbias parameters directly based on measured ambient circuit failure rates), should we deploy #7023. - We could also conceivably lower pb_disablepct to 25% as a - potential mitigation, based on the fact that a 20% c/n adversary - would only carry 24% of their circuits in the extreme case. - Implementation Notes: Log Messages Log messages need to be chosen with care to avoid alarming users. @@ -257,7 +256,7 @@ Implementation Notes: Consensus Parameters pb_dropguards=0 If non-zero, we should actually drop guards as opposed to warning. -Implementation Notes: Differences between this proposal and source +Implementation Notes: Differences between proposal and current source This proposal adds a few changes over the implementation currently deployed in origin/master. @@ -265,13 +264,25 @@ Implementation Notes: Differences between this proposal and source The log messages suggested above are different than those in the source. + The following consensus parameters had changes to their default + values, based on results from simulation and scanning: + pb_mincircs=150 + pb_noticepct=70 + pb_disablepct=30 + pb_scalecircs=300 + Also, the following consensus parameters are additions: - pb_multfactor - pb_warnpct - pb_dropguards + pb_multfactor=1 + pb_warnpct=50 + pb_dropguards=0 + + Finally, 0.2.3.x needs to be synced with origin/master, but should + also ignore the pb_dropguards parameter (but ideally still provide + the equivalent pb_dropguards torrc option). 1. http://freehaven.net/anonbib/cache/ccs07-doa.pdf 2. https://lists.torproject.org/pipermail/tor-dev/2012-March/003347.html 3. https://gitweb.torproject.org/torflow.git/tree/HEAD:/CircuitAnalysis/PathBi… 4. https://github.com/meejah/txtorcon/blob/exit_scanner/apps/exit_scanner/fail… +5. See 2.4.1 of path-spec.txt for further details on circuit timeout calculations.

1 0

[torspec/master] Merge remote-tracking branch 'mikeperry/path-bias-tuning'
by nickm＠torproject.org 18 Oct '12

18 Oct '12

commit 79f488c32c43562522e5592f2c19952dc7681a65 Merge: e70357b 3c56887 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 17 21:00:20 2012 -0400 Merge remote-tracking branch 'mikeperry/path-bias-tuning' proposals/209-path-bias-tuning.txt | 33 ++++++++++++++++++++++----------- 1 files changed, 22 insertions(+), 11 deletions(-)

1 0