[tor-commits] r25669: {website} bump packages to tor 0.2.2.36 (website/trunk/include)

2012-06-04 Thread Erinn Clark
Author: erinn Date: 2012-06-05 05:29:24 + (Tue, 05 Jun 2012) New Revision: 25669 Modified: website/trunk/include/versions.wmi Log: bump packages to tor 0.2.2.36 Modified: website/trunk/include/versions.wmi === --- website/trun

[tor-commits] [tor/master] Fix "make check-spaces" issues

2012-06-04 Thread nickm
commit 20d6f787aaea3252a07e5913e67cf63d60de4d9f Author: Nick Mathewson Date: Tue Jun 5 00:49:18 2012 -0400 Fix "make check-spaces" issues --- src/common/address.c |1 + src/common/crypto.c |3 ++- src/or/config.c |1 - src/or/connection_edge.c |8

[tor-commits] [tor/master] Resolve about 24 DOCDOCs

2012-06-04 Thread nickm
commit 913067f788d84d748d9377bb5563b2a8f88dc483 Author: Nick Mathewson Date: Tue Jun 5 00:17:54 2012 -0400 Resolve about 24 DOCDOCs --- src/common/compat.c |7 ++- src/common/compat_libevent.h |7 ++- src/common/log.c |2 +- src/common/tortls.c

[tor-commits] [torbrowser/maint-2.3] bump recommended-versions for 2.2.36-1

2012-06-04 Thread erinn
commit 22c0f8e298a9047fdb4cc2aa9ae81ea1a54748e3 Author: Erinn Clark Date: Tue Jun 5 01:08:48 2012 -0300 bump recommended-versions for 2.2.36-1 --- build-scripts/recommended-versions |5 + 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/build-scripts/recommended-versi

[tor-commits] [torbrowser/master] bump recommended-versions for 2.2.36-1

2012-06-04 Thread erinn
commit 22c0f8e298a9047fdb4cc2aa9ae81ea1a54748e3 Author: Erinn Clark Date: Tue Jun 5 01:08:48 2012 -0300 bump recommended-versions for 2.2.36-1 --- build-scripts/recommended-versions |5 + 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/build-scripts/recommended-versi

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

2012-06-04 Thread erinn
commit 722cec35254511047fdc2e4bcb5f094446c6bd47 Merge: 6ae1b78 22c0f8e Author: Erinn Clark Date: Tue Jun 5 01:09:05 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/recommended-versions |5 + 1 files changed, 5 insertions(+), 0 deletions(-) ___

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

2012-06-04 Thread erinn
commit 722cec35254511047fdc2e4bcb5f094446c6bd47 Merge: 6ae1b78 22c0f8e Author: Erinn Clark Date: Tue Jun 5 01:09:05 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/recommended-versions |5 + 1 files changed, 5 insertions(+), 0 deletions(-) ___

[tor-commits] [torbrowser/maint-2.2] bump recommended-versions for 2.2.36-1

2012-06-04 Thread erinn
commit 22c0f8e298a9047fdb4cc2aa9ae81ea1a54748e3 Author: Erinn Clark Date: Tue Jun 5 01:08:48 2012 -0300 bump recommended-versions for 2.2.36-1 --- build-scripts/recommended-versions |5 + 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/build-scripts/recommended-versi

[tor-commits] [tor/master] Missing copyright/license statement for procmon.c

2012-06-04 Thread nickm
commit 064e7c19c66a6e8a65e13508c57f3d7c89060112 Author: Nick Mathewson Date: Mon Jun 4 21:02:13 2012 -0400 Missing copyright/license statement for procmon.c --- src/common/procmon.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/common/procmon.c b/src/common/

[tor-commits] [tor/master] Add about 60 more DOCDOC comments to 0.2.3

2012-06-04 Thread nickm
commit 173b18c79b8e1f3a28e8b4122adb2b4ccf836c7b Author: Nick Mathewson Date: Mon Jun 4 19:51:00 2012 -0400 Add about 60 more DOCDOC comments to 0.2.3 Also, try to resolve some doxygen issues. First, define a magic "This is doxygen!" macro so that we take the correct branch in

[tor-commits] [tor/master] Update the "redox" doxygen/DOCDOC postprocessing script

2012-06-04 Thread nickm
commit b353cd7e508fd436ce4ec4bd55c52cc7619b29fd Author: Nick Mathewson Date: Mon Jun 4 19:56:44 2012 -0400 Update the "redox" doxygen/DOCDOC postprocessing script Somewhere along the line, doxygen and tor changed their behavior a little. The script is still a dreadful kludge, b

[tor-commits] [tor/master] Resolve some markup complaints from doxygen

2012-06-04 Thread nickm
commit 361260ff8f31b88946e50e96bd9f5d082264f02c Author: Nick Mathewson Date: Mon Jun 4 19:56:16 2012 -0400 Resolve some markup complaints from doxygen --- src/common/tortls.c|2 +- src/or/config.c|4 ++-- src/or/connection_or.c |6 +++--- src/or/routerlist.c|

[tor-commits] [tor/master] Resolve all currently pending DOCDOC items in master

2012-06-04 Thread nickm
commit f68c042637d253dfb3160357ba2b9ec530cb48ef Author: Nick Mathewson Date: Mon Jun 4 18:50:13 2012 -0400 Resolve all currently pending DOCDOC items in master --- src/common/compat.c |3 +- src/common/util.c| 12 +++- src/common/util.h|4 ++- src/or/conf

[tor-commits] r25668: {website} fix the wml for imgroot. (website/trunk/donate/en)

2012-06-04 Thread Andrew Lewman
Author: phobos Date: 2012-06-04 20:18:49 + (Mon, 04 Jun 2012) New Revision: 25668 Modified: website/trunk/donate/en/donate.wml Log: fix the wml for imgroot. Modified: website/trunk/donate/en/donate.wml === --- website/trunk/d

[tor-commits] r25667: {website} attempt to not leak data to amazon. (in website/trunk: donate/en images)

2012-06-04 Thread Andrew Lewman
Author: phobos Date: 2012-06-04 20:07:15 + (Mon, 04 Jun 2012) New Revision: 25667 Added: website/trunk/images/golden_small_donate_withmsg_whitebg.gif Modified: website/trunk/donate/en/donate.wml Log: attempt to not leak data to amazon. Modified: website/trunk/donate/en/donate.wml =

[tor-commits] r25666: {website} make an overview jobs page. now there's room for the QA auto (website/trunk/about/en)

2012-06-04 Thread Roger Dingledine
Author: arma Date: 2012-06-04 19:52:03 + (Mon, 04 Jun 2012) New Revision: 25666 Added: website/trunk/about/en/jobs-coredev.wml Modified: website/trunk/about/en/jobs.wml Log: make an overview jobs page. now there's room for the QA automation build engineer world savior position, or whatev

[tor-commits] [tor/master] Merge origin/maint-0.2.2 for 6007_strict

2012-06-04 Thread nickm
commit 41e8bee188571ca61c2f5628ea99dff34343d673 Merge: 329e1c6 491dc3a Author: Nick Mathewson Date: Mon Jun 4 11:47:36 2012 -0400 Merge origin/maint-0.2.2 for 6007_strict This code shouldn't have any effect in 0.2.3, since we already accept (and handle) data received while we a

[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug6007_strict_squashed' into maint-0.2.2

2012-06-04 Thread nickm
commit 491dc3a601d7c2610503f73192bd1a40bcb37ab2 Merge: 6d85a79 af54a01 Author: Nick Mathewson Date: Mon Jun 4 11:40:52 2012 -0400 Merge remote-tracking branch 'public/bug6007_strict_squashed' into maint-0.2.2 changes/bug6007|5 + src/or/connection_or.c | 22

[tor-commits] [tor/master] Kill non-open OR connections with any data on their inbufs.

2012-06-04 Thread nickm
commit af54a0182870babec62bf07d067ca82a67c423de Author: Nick Mathewson Date: Thu May 31 11:19:35 2012 -0400 Kill non-open OR connections with any data on their inbufs. This fixes a DoS issue where a client could send so much data in 5 minutes that they exhausted the server's RA

[tor-commits] [tor/maint-0.2.2] Merge remote-tracking branch 'public/bug6007_strict_squashed' into maint-0.2.2

2012-06-04 Thread nickm
commit 491dc3a601d7c2610503f73192bd1a40bcb37ab2 Merge: 6d85a79 af54a01 Author: Nick Mathewson Date: Mon Jun 4 11:40:52 2012 -0400 Merge remote-tracking branch 'public/bug6007_strict_squashed' into maint-0.2.2 changes/bug6007|5 + src/or/connection_or.c | 22

[tor-commits] [tor/maint-0.2.2] Kill non-open OR connections with any data on their inbufs.

2012-06-04 Thread nickm
commit af54a0182870babec62bf07d067ca82a67c423de Author: Nick Mathewson Date: Thu May 31 11:19:35 2012 -0400 Kill non-open OR connections with any data on their inbufs. This fixes a DoS issue where a client could send so much data in 5 minutes that they exhausted the server's RA

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

2012-06-04 Thread nickm
commit 329e1c65d3c73ad7b3b4cdaa870dd04fd7fb01b7 Merge: 75b72bf 6d85a79 Author: Nick Mathewson Date: Mon Jun 4 11:36:33 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug6033 |6 ++ src/common/tortls.c | 15 +++ 2 files changed, 21 insertions

[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug6033' into maint-0.2.2

2012-06-04 Thread nickm
commit 6d85a796539424882f878ccac5ae4640a6fbb561 Merge: b7e863c 841a8d5 Author: Nick Mathewson Date: Mon Jun 4 11:33:27 2012 -0400 Merge remote-tracking branch 'public/bug6033' into maint-0.2.2 changes/bug6033 |6 ++ src/common/tortls.c | 15 +++ 2 files changed,

[tor-commits] [tor/master] Work around a bug in OpenSSL 1.0.1's TLS 1.1 and TLS 1.2 support

2012-06-04 Thread nickm
commit 841a8d551abd191b23ad2f78dfb07d9e4ff8ace2 Author: Nick Mathewson Date: Sat Jun 2 20:05:32 2012 -0400 Work around a bug in OpenSSL 1.0.1's TLS 1.1 and TLS 1.2 support It appears that when OpenSSL negotiates a 1.1 or 1.2 connection, and it decides to renegotiate, the client

[tor-commits] [tor/maint-0.2.2] Merge remote-tracking branch 'public/bug6033' into maint-0.2.2

2012-06-04 Thread nickm
commit 6d85a796539424882f878ccac5ae4640a6fbb561 Merge: b7e863c 841a8d5 Author: Nick Mathewson Date: Mon Jun 4 11:33:27 2012 -0400 Merge remote-tracking branch 'public/bug6033' into maint-0.2.2 changes/bug6033 |6 ++ src/common/tortls.c | 15 +++ 2 files changed,

[tor-commits] [tor/maint-0.2.2] Work around a bug in OpenSSL 1.0.1's TLS 1.1 and TLS 1.2 support

2012-06-04 Thread nickm
commit 841a8d551abd191b23ad2f78dfb07d9e4ff8ace2 Author: Nick Mathewson Date: Sat Jun 2 20:05:32 2012 -0400 Work around a bug in OpenSSL 1.0.1's TLS 1.1 and TLS 1.2 support It appears that when OpenSSL negotiates a 1.1 or 1.2 connection, and it decides to renegotiate, the client

[tor-commits] [tor/master] Fix build warning on Lenny about strtok_r unit test

2012-06-04 Thread nickm
commit 75b72bf62122c74f4c0c193e9364928aecdba695 Author: Nick Mathewson Date: Mon Jun 4 11:07:52 2012 -0400 Fix build warning on Lenny about strtok_r unit test This fixes a warning in efb8a09f, where Debain Lenny's GCC doesn't get that for (i=0; i<3; ++i) { con