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

[torbrowser/maint-2.3] OSX: Fix 64bit firefox build on Lion
by erinn＠torproject.org 26 Apr '12

26 Apr '12

commit b38e2b0990e1e2ed095bc4db8b5716e7791cd0c0 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Apr 27 00:13:12 2012 +0200 OSX: Fix 64bit firefox build on Lion --- build-scripts/config/mozconfig-osx-x86_64 | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build-scripts/config/mozconfig-osx-x86_64 b/build-scripts/config/mozconfig-osx-x86_64 index 5511829..d4857b6 100755 --- a/build-scripts/config/mozconfig-osx-x86_64 +++ b/build-scripts/config/mozconfig-osx-x86_64 @@ -1,9 +1,9 @@ . $topsrcdir/browser/config/mozconfig -CC="gcc-4.2 -arch x86_64" -CXX="g++-4.2 -arch x86_64" -HOST_CC="gcc-4.2" -HOST_CXX="g++-4.2" +CC="gcc -arch x86_64" +CXX="g++ -arch x86_64" +HOST_CC="gcc" +HOST_CXX="g++" RANLIB=ranlib AR=ar AS=$CC @@ -11,6 +11,7 @@ LD=ld STRIP="strip -x -S" CROSS_COMPILE=1 +mk_add_options MOZ_MAKE_FLAGS="-s --no-print-directory -j8" mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ mk_add_options MOZ_APP_DISPLAYNAME=TorBrowser mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'

1 0

[flashproxy/master] Catch socket errors when doing the first sends of buffered data.
by dcf＠torproject.org 26 Apr '12

26 Apr '12

commit 31b471d9c43980c7e8d44df86a5eec9791d23b48 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Apr 26 09:57:35 2012 -0700 Catch socket errors when doing the first sends of buffered data. --- connector.py | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/connector.py b/connector.py index d101a30..3e2bfd9 100755 --- a/connector.py +++ b/connector.py @@ -711,9 +711,16 @@ def match_proxies(): remote.partner = local local.partner = remote if remote.buf: - proxy_chunk_remote_to_local(remote, local, remote.buf) + if not proxy_chunk_remote_to_local(remote, local, remote.buf): + remotes.remove(remote) + locals.remove(local) + register() + return if local.buf: - proxy_chunk_local_to_remote(local, remote, local.buf) + if not proxy_chunk_local_to_remote(local, remote, local.buf): + remotes.remove(remote) + locals.remove(local) + return class TimeoutSocket(object): def __init__(self, fd):

1 0

[flashproxy/master] Use a longer timeout in httpget.
by dcf＠torproject.org 26 Apr '12

26 Apr '12

commit eda2ca7362a58c17ac552f868cb9c6e5593fc884 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Apr 26 10:05:41 2012 -0700 Use a longer timeout in httpget. --- experiments/throughput/httpget.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/experiments/throughput/httpget.py b/experiments/throughput/httpget.py index a08412b..acaa565 100755 --- a/experiments/throughput/httpget.py +++ b/experiments/throughput/httpget.py @@ -19,7 +19,7 @@ for o, a in opts: label = a try: - stream = urllib2.urlopen(args[0], timeout=10) + stream = urllib2.urlopen(args[0], timeout=100) start_time = time.time() while stream.read(BLOCK_SIZE): pass

1 0

r25628: {website} foci deadline pushed back (website/trunk/en)
by Roger Dingledine 26 Apr '12

26 Apr '12

Author: arma Date: 2012-04-26 17:10:57 +0000 (Thu, 26 Apr 2012) New Revision: 25628 Modified: website/trunk/en/index.wml Log: foci deadline pushed back Modified: website/trunk/en/index.wml =================================================================== --- website/trunk/en/index.wml 2012-04-26 16:18:31 UTC (rev 25627) +++ website/trunk/en/index.wml 2012-04-26 17:10:57 UTC (rev 25628) @@ -204,7 +204,7 @@ <p>Roger is co-chairing the <a href="https://blog.torproject.org/blog/call-papers-free-and-open-communications-i…">Free and Open Communications on the Internet (FOCI) - Workshop</a>. Submissions are due April 26.</p> + Workshop</a>. Submissions are due May 3.</p> </td> </tr> <tr>

1 0

[torbrowser/maint-2.2] Revert "Settings I have to change"
by erinn＠torproject.org 26 Apr '12

26 Apr '12

commit a3648520133b397f718892eb86083553cc3d0313 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Apr 26 15:08:43 2012 +0200 Revert "Settings I have to change" This reverts commit dc9c276c0061fe2946c6e2c5901d0a2e29ef4742. Accidentally included in a branch for openssl 1.0.1b fix. --- build-scripts/osx.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 4619c78..ed34a9b 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -31,7 +31,7 @@ BACKWARDS_COMPAT=$(MIN_VERSION) $(CF_MIN_VERSION) $(LD_MIN_VERSION) ## Build machine specific settings # Number of cpu cores used to build in parallel -NUM_CORES=8 +NUM_CORES=4 ## Location of directory for source fetching FETCH_DIR=$(PWD)/build @@ -76,7 +76,7 @@ build-qt: build-zlib build-openssl $(QT_DIR) touch $(STAMP_DIR)/build-qt VIDALIA_OPTS=-DCMAKE_OSX_ARCHITECTURES=$(ARCH_TYPE) -DQT_QMAKE_EXECUTABLE=$(BUILT_DIR)/bin/qmake \ - -DCMAKE_BUILD_TYPE=debug -DCMAKE_OSX_SYSROOT=${SDK_PATH} .. + -DCMAKE_BUILD_TYPE=debug .. build-vidalia: build-openssl build-qt $(VIDALIA_DIR) -mkdir $(VIDALIA_DIR)/build cd $(VIDALIA_DIR)/build && \

1 0

[torbrowser/maint-2.3] Revert "Settings I have to change"
by erinn＠torproject.org 26 Apr '12

26 Apr '12

commit a3648520133b397f718892eb86083553cc3d0313 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Apr 26 15:08:43 2012 +0200 Revert "Settings I have to change" This reverts commit dc9c276c0061fe2946c6e2c5901d0a2e29ef4742. Accidentally included in a branch for openssl 1.0.1b fix. --- build-scripts/osx.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 4619c78..ed34a9b 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -31,7 +31,7 @@ BACKWARDS_COMPAT=$(MIN_VERSION) $(CF_MIN_VERSION) $(LD_MIN_VERSION) ## Build machine specific settings # Number of cpu cores used to build in parallel -NUM_CORES=8 +NUM_CORES=4 ## Location of directory for source fetching FETCH_DIR=$(PWD)/build @@ -76,7 +76,7 @@ build-qt: build-zlib build-openssl $(QT_DIR) touch $(STAMP_DIR)/build-qt VIDALIA_OPTS=-DCMAKE_OSX_ARCHITECTURES=$(ARCH_TYPE) -DQT_QMAKE_EXECUTABLE=$(BUILT_DIR)/bin/qmake \ - -DCMAKE_BUILD_TYPE=debug -DCMAKE_OSX_SYSROOT=${SDK_PATH} .. + -DCMAKE_BUILD_TYPE=debug .. build-vidalia: build-openssl build-qt $(VIDALIA_DIR) -mkdir $(VIDALIA_DIR)/build cd $(VIDALIA_DIR)/build && \

1 0

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

26 Apr '12

commit 2f4e9b59d6bfb36cdc6ca108b9b210c37dd0a67f Merge: 92f6355 a364852 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Apr 26 13:50:26 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/osx.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)

1 0

[torbrowser/master] Revert "Settings I have to change"
by erinn＠torproject.org 26 Apr '12

26 Apr '12

commit a3648520133b397f718892eb86083553cc3d0313 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Apr 26 15:08:43 2012 +0200 Revert "Settings I have to change" This reverts commit dc9c276c0061fe2946c6e2c5901d0a2e29ef4742. Accidentally included in a branch for openssl 1.0.1b fix. --- build-scripts/osx.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 4619c78..ed34a9b 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -31,7 +31,7 @@ BACKWARDS_COMPAT=$(MIN_VERSION) $(CF_MIN_VERSION) $(LD_MIN_VERSION) ## Build machine specific settings # Number of cpu cores used to build in parallel -NUM_CORES=8 +NUM_CORES=4 ## Location of directory for source fetching FETCH_DIR=$(PWD)/build @@ -76,7 +76,7 @@ build-qt: build-zlib build-openssl $(QT_DIR) touch $(STAMP_DIR)/build-qt VIDALIA_OPTS=-DCMAKE_OSX_ARCHITECTURES=$(ARCH_TYPE) -DQT_QMAKE_EXECUTABLE=$(BUILT_DIR)/bin/qmake \ - -DCMAKE_BUILD_TYPE=debug -DCMAKE_OSX_SYSROOT=${SDK_PATH} .. + -DCMAKE_BUILD_TYPE=debug .. build-vidalia: build-openssl build-qt $(VIDALIA_DIR) -mkdir $(VIDALIA_DIR)/build cd $(VIDALIA_DIR)/build && \

1 0

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

26 Apr '12

commit 2f4e9b59d6bfb36cdc6ca108b9b210c37dd0a67f Merge: 92f6355 a364852 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Apr 26 13:50:26 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/osx.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 26 Apr '12

26 Apr '12

commit bed0a71fc2603c0b2d95aa1eb8e76f972f2e7970 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 26 16:45:16 2012 +0000 Update translations for vidalia_help --- nb/links.po | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/nb/links.po b/nb/links.po index 1c18712..25b950e 100644 --- a/nb/links.po +++ b/nb/links.po @@ -77,5 +77,3 @@ msgstr "" #: links.html:60 msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>" msgstr "" - -

1 0