[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'

2012-10-18 Thread nickm
commit 9f1b1ef4fbc67b2d3f6e2f9b2dd4d8cd44dc49b7 Merge: 981f25a a0e9dc9 Author: Nick Mathewson Date: Fri Oct 19 01:01:26 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' changes/bug7139 |9 + src/common/tortls.c |8 2 files changed, 17 insertions(+)

[tor-commits] [tor/master] Disable TLS Session Tickets, which we were apparently getting for free

2012-10-18 Thread nickm
commit 8743080a289a20bfaf0a67d6382ba0c2a6d6534d Author: Nick Mathewson Date: Wed Oct 17 19:57:27 2012 -0400 Disable TLS Session Tickets, which we were apparently getting for free OpenSSL 1.0.0 added an implementation of TLS session tickets, a "feature" that let session resumpti

[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3

2012-10-18 Thread nickm
commit a0e9dc9f55a452d78d9d16b4a2fc7d57dafa0409 Merge: e2549c3 8743080 Author: Nick Mathewson Date: Fri Oct 19 00:58:33 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 changes/bug7139 |9 + src/common/tortls.c |8 2 files changed,

[tor-commits] [tor/maint-0.2.3] Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3

2012-10-18 Thread nickm
commit a0e9dc9f55a452d78d9d16b4a2fc7d57dafa0409 Merge: e2549c3 8743080 Author: Nick Mathewson Date: Fri Oct 19 00:58:33 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 changes/bug7139 |9 + src/common/tortls.c |8 2 files changed,

[tor-commits] [tor/maint-0.2.3] Disable TLS Session Tickets, which we were apparently getting for free

2012-10-18 Thread nickm
commit 8743080a289a20bfaf0a67d6382ba0c2a6d6534d Author: Nick Mathewson Date: Wed Oct 17 19:57:27 2012 -0400 Disable TLS Session Tickets, which we were apparently getting for free OpenSSL 1.0.0 added an implementation of TLS session tickets, a "feature" that let session resumpti

[tor-commits] [tor/maint-0.2.2] Disable TLS Session Tickets, which we were apparently getting for free

2012-10-18 Thread nickm
commit 8743080a289a20bfaf0a67d6382ba0c2a6d6534d Author: Nick Mathewson Date: Wed Oct 17 19:57:27 2012 -0400 Disable TLS Session Tickets, which we were apparently getting for free OpenSSL 1.0.0 added an implementation of TLS session tickets, a "feature" that let session resumpti

[tor-commits] [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

2012-10-18 Thread nickm
commit 981f25a73ad5ff5de1147e6f9bc3cb7c55cda71b Author: Andrea Shepard 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 |

[tor-commits] [tor/master] Document lifespan of return values of the _remote_descr() funcs

2012-10-18 Thread nickm
commit cb9d1237641290dc92b11540b96db036748429be Author: Nick Mathewson 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/ch

[tor-commits] [tor/master] Fix a bug in channel_dump_statistics

2012-10-18 Thread nickm
commit 850c9901445a1d2a4ce7ecf16e03f939fcd821d6 Author: Nick Mathewson Date: Wed Oct 17 11:29:59 2012 -0400 Fix a bug in channel_dump_statistics We were calling channel_get_actual_remote_descr() before we used the output of a previous channel_get_canonical_remote_descr(), thus

[tor-commits] [tor/master] Restore the 'address' value of tunneled connections

2012-10-18 Thread nickm
commit 26946c659b5abdc38fd4dc8cd4b4659aadcf05f0 Author: Nick Mathewson Date: Wed Oct 17 11:23:26 2012 -0400 Restore the 'address' value of tunneled connections When we merged the channel code, we made the 'address' field of linked directory connections created with begindir (an

[tor-commits] [tor/master] Fix for bug 7112 (spewing complaints from tor_addr_is_internal)

2012-10-18 Thread nickm
commit 898bd1ae8f1eeb880eaaeba2caa1cda435a1ac5b Author: Nick Mathewson Date: Wed Oct 17 11:15:01 2012 -0400 Fix for bug 7112 (spewing complaints from tor_addr_is_internal) In 4768c0efe3e9471cc367c3740d1a4ba0ab79626c (not in any released version of Tor), we removed a little bloc

[tor-commits] [tor/master] Document return value of channel_get_addr_if_possible

2012-10-18 Thread nickm
commit f633184af1f0dd4a0d2a4c3490d95a8aa6e964d1 Author: Nick Mathewson Date: Wed Oct 17 10:34:23 2012 -0400 Document return value of channel_get_addr_if_possible --- src/or/channel.c |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/or/channel.c b/src/or/cha

[tor-commits] [flashproxy/master] Put imap_login inside the exception block with imap_loop.

2012-10-18 Thread dcf
commit c47aa6e56fddead101c96238e35d7037aaaff092 Author: David Fifield 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

[tor-commits] [torbrowser/maint-2.2] bump all stable tbbs to 2.2.39-4 for updated non-crashy firefox

2012-10-18 Thread erinn
commit f550eda4c97664237bd78a547c7f9992664e9206 Author: Erinn Clark 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 ++--

[tor-commits] [torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3

2012-10-18 Thread erinn
commit aa51199d160b836dbb46a2af705806074d498033 Merge: 8b21ddd 279edcd Author: Erinn Clark 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 ++-- buil

[tor-commits] [torbrowser/master] Merge branch 'maint-2.2' into maint-2.3

2012-10-18 Thread erinn
commit aa51199d160b836dbb46a2af705806074d498033 Merge: 8b21ddd 279edcd Author: Erinn Clark 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 ++-- buil

[tor-commits] [torbrowser/maint-2.3] bump stable tbbs to 2.2.39-4 for updated non-crashy firefox

2012-10-18 Thread erinn
commit 279edcd26f0327e98cea5278a16c99c62dbe4885 Author: Erinn Clark 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 ++-- buil

[tor-commits] [torbrowser/master] bump stable tbbs to 2.2.39-4 for updated non-crashy firefox

2012-10-18 Thread erinn
commit 279edcd26f0327e98cea5278a16c99c62dbe4885 Author: Erinn Clark 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 ++-- buil