[tor-commits] [metrics-lib/master] Set file name of parsed descriptor files.

2012-04-25 Thread karsten
commit 4eadb9b5dc48f10417fc70f1be4539da57b7b0af Author: Karsten Loesing Date: Tue Apr 24 15:31:43 2012 +0200 Set file name of parsed descriptor files. --- .../descriptor/impl/DescriptorReaderImpl.java |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/org/tor

[tor-commits] [metrics-lib/master] Parse annotations preceding the actual descriptors.

2012-04-25 Thread karsten
commit c87f5c92adea22967dbd6e1d5f6973f329ee0e95 Author: Karsten Loesing Date: Wed Apr 25 12:08:59 2012 +0200 Parse annotations preceding the actual descriptors. --- src/org/torproject/descriptor/Descriptor.java |3 + .../torproject/descriptor/impl/DescriptorImpl.java | 64 ++

[tor-commits] [torbrowser/maint-2.3] add firefox rebranding images, patch, and makefile changes

2012-04-25 Thread erinn
commit e3e2457216a83c25c7f6287b4feec3ae6dd63855 Author: Erinn Clark Date: Wed Apr 25 09:33:02 2012 -0300 add firefox rebranding images, patch, and makefile changes --- build-scripts/branding/about.png | Bin 20908 -> 0 bytes build-scripts/branding/background.png

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

2012-04-25 Thread erinn
commit 8894278f6c5a23f8be9e001d4330a47df9b2ac1e Merge: 4128643 300c2ef Author: Mike Perry Date: Tue Apr 24 17:42:04 2012 -0700 Merge remote-tracking branch 'origin/maint-2.2' into maint-2.2 build-scripts/osx.mk |2 +- build-scripts/versions.mk |4 ++-- 2 files changed, 3 inse

[tor-commits] [torbrowser/maint-2.2] add firefox rebranding images, patch, and makefile changes

2012-04-25 Thread erinn
commit e3e2457216a83c25c7f6287b4feec3ae6dd63855 Author: Erinn Clark Date: Wed Apr 25 09:33:02 2012 -0300 add firefox rebranding images, patch, and makefile changes --- build-scripts/branding/about.png | Bin 20908 -> 0 bytes build-scripts/branding/background.png

[tor-commits] [torbrowser/master] add firefox rebranding images, patch, and makefile changes

2012-04-25 Thread erinn
commit e3e2457216a83c25c7f6287b4feec3ae6dd63855 Author: Erinn Clark Date: Wed Apr 25 09:33:02 2012 -0300 add firefox rebranding images, patch, and makefile changes --- build-scripts/branding/about.png | Bin 20908 -> 0 bytes build-scripts/branding/background.png

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

2012-04-25 Thread erinn
commit 7acecea502d3ff2e2e63639d7050140da0031032 Merge: f8630e8 e3e2457 Author: Erinn Clark Date: Wed Apr 25 09:34:59 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/branding/about.png | Bin 20908 -> 0 bytes build-scripts/branding/background.png

[tor-commits] [torbrowser/master] Merge remote-tracking branch 'origin/maint-2.2' into maint-2.2

2012-04-25 Thread erinn
commit 8894278f6c5a23f8be9e001d4330a47df9b2ac1e Merge: 4128643 300c2ef Author: Mike Perry Date: Tue Apr 24 17:42:04 2012 -0700 Merge remote-tracking branch 'origin/maint-2.2' into maint-2.2 build-scripts/osx.mk |2 +- build-scripts/versions.mk |4 ++-- 2 files changed, 3 inse

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

2012-04-25 Thread erinn
commit 7acecea502d3ff2e2e63639d7050140da0031032 Merge: f8630e8 e3e2457 Author: Erinn Clark Date: Wed Apr 25 09:34:59 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/branding/about.png | Bin 20908 -> 0 bytes build-scripts/branding/background.png

[tor-commits] [translation/vidalia_help] Update translations for vidalia_help

2012-04-25 Thread translation
commit 792baec51940674a14cb3b49695e4344513575e2 Author: Translation commit bot Date: Wed Apr 25 15:15:17 2012 + Update translations for vidalia_help --- eu/services.po |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eu/services.po b/eu/services.po index 33

[tor-commits] [translation/vidalia_help] Update translations for vidalia_help

2012-04-25 Thread translation
commit 9129408f8fa4489e756daf2cb89d7a86af00baa0 Author: Translation commit bot Date: Wed Apr 25 15:45:17 2012 + Update translations for vidalia_help --- eu/services.po | 10 +- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eu/services.po b/eu/services.po inde

[tor-commits] [torbrowser/maint-2.3] fix path to branding directory

2012-04-25 Thread erinn
commit ab05ecd6fd420ed9a7efb75eb57163f6892ce530 Author: Erinn Clark Date: Wed Apr 25 13:42:29 2012 -0300 fix path to branding directory --- build-scripts/linux.mk |2 +- build-scripts/osx.mk |2 +- build-scripts/windows.mk |2 +- 3 files changed, 3 insertions(+), 3 deleti

[tor-commits] [torbrowser/maint-2.3] bump firefox to 12

2012-04-25 Thread erinn
commit e6f9b2d5488cb5d705299a817feb62ce8e2534f0 Author: Erinn Clark Date: Wed Apr 25 13:43:07 2012 -0300 bump firefox to 12 --- build-scripts/versions.mk |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 6b

[tor-commits] [torbrowser/maint-2.2] fix path to branding directory

2012-04-25 Thread erinn
commit ab05ecd6fd420ed9a7efb75eb57163f6892ce530 Author: Erinn Clark Date: Wed Apr 25 13:42:29 2012 -0300 fix path to branding directory --- build-scripts/linux.mk |2 +- build-scripts/osx.mk |2 +- build-scripts/windows.mk |2 +- 3 files changed, 3 insertions(+), 3 deleti

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

2012-04-25 Thread erinn
commit c6d006f071f7a8dcd716365804ca416d6813f3e6 Merge: 7acecea ab05ecd Author: Erinn Clark Date: Wed Apr 25 13:42:44 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/linux.mk |2 +- build-scripts/osx.mk |2 +- build-scripts/windows.mk |2 +- 3 files chang

[tor-commits] [torbrowser/maint-2.2] bump firefox to 12

2012-04-25 Thread erinn
commit e6f9b2d5488cb5d705299a817feb62ce8e2534f0 Author: Erinn Clark Date: Wed Apr 25 13:43:07 2012 -0300 bump firefox to 12 --- build-scripts/versions.mk |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 6b

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

2012-04-25 Thread erinn
commit b8574c221a6454f7e9cd0082155c09d55c2c200a Merge: c6d006f e6f9b2d Author: Erinn Clark Date: Wed Apr 25 13:43:17 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/versions.mk |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) __

[tor-commits] [torbrowser/master] fix path to branding directory

2012-04-25 Thread erinn
commit ab05ecd6fd420ed9a7efb75eb57163f6892ce530 Author: Erinn Clark Date: Wed Apr 25 13:42:29 2012 -0300 fix path to branding directory --- build-scripts/linux.mk |2 +- build-scripts/osx.mk |2 +- build-scripts/windows.mk |2 +- 3 files changed, 3 insertions(+), 3 deleti

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

2012-04-25 Thread erinn
commit b8574c221a6454f7e9cd0082155c09d55c2c200a Merge: c6d006f e6f9b2d Author: Erinn Clark Date: Wed Apr 25 13:43:17 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/versions.mk |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) __

[tor-commits] [torbrowser/master] bump firefox to 12

2012-04-25 Thread erinn
commit e6f9b2d5488cb5d705299a817feb62ce8e2534f0 Author: Erinn Clark Date: Wed Apr 25 13:43:07 2012 -0300 bump firefox to 12 --- build-scripts/versions.mk |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 6b

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

2012-04-25 Thread erinn
commit c6d006f071f7a8dcd716365804ca416d6813f3e6 Merge: 7acecea ab05ecd Author: Erinn Clark Date: Wed Apr 25 13:42:44 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/linux.mk |2 +- build-scripts/osx.mk |2 +- build-scripts/windows.mk |2 +- 3 files chang

[tor-commits] [translation/https_everywhere] Update translations for https_everywhere

2012-04-25 Thread translation
commit 02beb4e4e1c07484d91dbb72474ddf4cbe9b02a9 Author: Translation commit bot Date: Wed Apr 25 17:45:31 2012 + Update translations for https_everywhere --- fr/https-everywhere.dtd |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fr/https-everywhere.dtd b/fr/

[tor-commits] [translation/https_everywhere_completed] Update translations for https_everywhere_completed

2012-04-25 Thread translation
commit b04c776c3c8f894bf351415a3390f8de6c31e265 Author: Translation commit bot Date: Wed Apr 25 17:45:36 2012 + Update translations for https_everywhere_completed --- fr/https-everywhere.dtd |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fr/https-everywhere

[tor-commits] [translation/https_everywhere] Update translations for https_everywhere

2012-04-25 Thread translation
commit 45a75bc8477b86445cee407389c48714836a7390 Author: Translation commit bot Date: Wed Apr 25 18:15:29 2012 + Update translations for https_everywhere --- el/ssl-observatory.dtd | 91 1 files changed, 91 insertions(+), 0 deletions(-)

[tor-commits] [translation/https_everywhere_completed] Update translations for https_everywhere_completed

2012-04-25 Thread translation
commit f2e65983b909c0bb822c1de8eb178db8c1131b4d Author: Translation commit bot Date: Wed Apr 25 18:15:32 2012 + Update translations for https_everywhere_completed --- el/ssl-observatory.dtd | 91 1 files changed, 91 insertions(+), 0 de

[tor-commits] [flashproxy/master] Use a 10MB file in the throughput test.

2012-04-25 Thread dcf
commit 48e645675d8fabd2ebcbfa91f0a6037cf8511b63 Author: David Fifield Date: Mon Apr 9 09:54:52 2012 -0700 Use a 10MB file in the throughput test. --- experiments/throughput/throughput.sh |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/experiments/throughput/throug

[tor-commits] [flashproxy/master] Update switching experiment for JS proxy.

2012-04-25 Thread dcf
commit a9dce418b568aee67076abb5727c2dcbae73e835 Author: David Fifield Date: Sun Apr 8 17:11:15 2012 -0700 Update switching experiment for JS proxy. --- experiments/switching/local-http-alternating.sh |7 --- experiments/switching/local-http-constant.sh| 11 --- experi

[tor-commits] [torbrowser/maint-2.3] Merge branch 'openssl-1.0.1a-fix' into maint-2.2

2012-04-25 Thread erinn
commit f2d994010efe2a8189236babb06b6da26c876a04 Merge: e6f9b2d af6f55b Author: Erinn Clark Date: Wed Apr 25 21:01:25 2012 -0300 Merge branch 'openssl-1.0.1a-fix' into maint-2.2 .../openssl/0002-Fix-openssl-1.0.1a-compile.patch | 26 1 files changed, 26 insertions(+

[tor-commits] [torbrowser/maint-2.2] Merge branch 'openssl-1.0.1a-fix' into maint-2.2

2012-04-25 Thread erinn
commit f2d994010efe2a8189236babb06b6da26c876a04 Merge: e6f9b2d af6f55b Author: Erinn Clark Date: Wed Apr 25 21:01:25 2012 -0300 Merge branch 'openssl-1.0.1a-fix' into maint-2.2 .../openssl/0002-Fix-openssl-1.0.1a-compile.patch | 26 1 files changed, 26 insertions(+

[tor-commits] [torbrowser/maint-2.3] OSX: Fix 64bit compile of openssl

2012-04-25 Thread erinn
commit af6f55bb51860cab72ef489f19996f55af23645c Author: Sebastian Hahn Date: Thu Apr 26 00:00:02 2012 +0200 OSX: Fix 64bit compile of openssl --- .../openssl/0002-Fix-openssl-1.0.1a-compile.patch | 26 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/

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

2012-04-25 Thread erinn
commit 6648eafc126d163173dc8b7b204046611f085d36 Merge: b8574c2 f2d9940 Author: Erinn Clark Date: Wed Apr 25 21:01:34 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 .../openssl/0002-Fix-openssl-1.0.1a-compile.patch | 26 1 files changed, 26 insertions(+), 0 dele

[tor-commits] [torbrowser/maint-2.2] OSX: Fix 64bit compile of openssl

2012-04-25 Thread erinn
commit af6f55bb51860cab72ef489f19996f55af23645c Author: Sebastian Hahn Date: Thu Apr 26 00:00:02 2012 +0200 OSX: Fix 64bit compile of openssl --- .../openssl/0002-Fix-openssl-1.0.1a-compile.patch | 26 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/

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

2012-04-25 Thread erinn
commit 6648eafc126d163173dc8b7b204046611f085d36 Merge: b8574c2 f2d9940 Author: Erinn Clark Date: Wed Apr 25 21:01:34 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 .../openssl/0002-Fix-openssl-1.0.1a-compile.patch | 26 1 files changed, 26 insertions(+), 0 dele

[tor-commits] [torbrowser/master] Merge branch 'openssl-1.0.1a-fix' into maint-2.2

2012-04-25 Thread erinn
commit f2d994010efe2a8189236babb06b6da26c876a04 Merge: e6f9b2d af6f55b Author: Erinn Clark Date: Wed Apr 25 21:01:25 2012 -0300 Merge branch 'openssl-1.0.1a-fix' into maint-2.2 .../openssl/0002-Fix-openssl-1.0.1a-compile.patch | 26 1 files changed, 26 insertions(+

[tor-commits] [torbrowser/master] OSX: Fix 64bit compile of openssl

2012-04-25 Thread erinn
commit af6f55bb51860cab72ef489f19996f55af23645c Author: Sebastian Hahn Date: Thu Apr 26 00:00:02 2012 +0200 OSX: Fix 64bit compile of openssl --- .../openssl/0002-Fix-openssl-1.0.1a-compile.patch | 26 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/

[tor-commits] r25626: {website} patch to dlpage01 javascript. (website/trunk/js)

2012-04-25 Thread Andrew Lewman
Author: phobos Date: 2012-04-26 00:36:52 + (Thu, 26 Apr 2012) New Revision: 25626 Modified: website/trunk/js/dlpage01.js Log: patch to dlpage01 javascript. Modified: website/trunk/js/dlpage01.js === (Binary files differ) ___