[tor-commits] [metrics-db/master] Fix link to directory key certificates.

2014-09-29 Thread karsten
commit 2d40d1b77fd4bd858751fa37cf3649df3afbe405 Author: Karsten Loesing karsten.loes...@gmx.net Date: Mon Sep 29 09:11:08 2014 +0200 Fix link to directory key certificates. Spotted by cypherpunks, resolves #13265. --- web/formats.html |4 ++-- 1 file changed, 2 insertions(+),

[tor-commits] [tor/master] Whitespace fixes

2014-09-29 Thread nickm
commit b45bfba2ce3754aa8107717e638b325dd30f05ed Author: Nick Mathewson ni...@torproject.org Date: Mon Sep 29 08:48:22 2014 -0400 Whitespace fixes --- src/or/config.c|1 - src/test/test_crypto.c | 13 - 2 files changed, 8 insertions(+), 6 deletions(-) diff --git

[tor-commits] [tor/master] Improving error message.

2014-09-29 Thread nickm
commit f20c72f45647cf869f02a60addc9e079760ee763 Author: rl1987 rl1...@sdf.lonestar.org Date: Sun Sep 28 18:09:25 2014 +0300 Improving error message. --- changes/bug13228 |5 + configure.ac |4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git

[tor-commits] [tor/master] Merge remote-tracking branch 'rl1987/bug13228'

2014-09-29 Thread nickm
commit 56f92ca02d2fb972bc476f235a545b3dc764f58d Merge: b45bfba f20c72f Author: Nick Mathewson ni...@torproject.org Date: Mon Sep 29 08:55:17 2014 -0400 Merge remote-tracking branch 'rl1987/bug13228' changes/bug13228 |5 + configure.ac |4 +++- 2 files changed, 8

[tor-commits] [tor/master] Do not launch pluggable transport plugins when DisableNetwork is set.

2014-09-29 Thread nickm
commit fa60a64088ace76aa2a3c1a8347ee32d4bd3ee21 Author: Yawning Angel yawn...@schwanenlied.me Date: Wed Sep 24 09:39:15 2014 + Do not launch pluggable transport plugins when DisableNetwork is set. When DisableNetwork is set, do not launch pluggable transport plugins, and if

[tor-commits] [tor/master] Merge remote-tracking branch 'yawning/bug13213'

2014-09-29 Thread nickm
commit dc019b06548e49ce4ea2a1501715985b648f2606 Merge: 56f92ca fa60a64 Author: Nick Mathewson ni...@torproject.org Date: Mon Sep 29 08:57:19 2014 -0400 Merge remote-tracking branch 'yawning/bug13213' changes/bug13213 |4 src/or/config.c | 32 +--- 2

[tor-commits] [tor/master] Changes file for ticket 961

2014-09-29 Thread nickm
commit f15e5aedbc6298f4fad4ef6cff755591a44a7109 Author: Nick Mathewson ni...@torproject.org Date: Tue Sep 23 08:57:22 2014 -0400 Changes file for ticket 961 --- changes/ticket961 |5 + 1 file changed, 5 insertions(+) diff --git a/changes/ticket961 b/changes/ticket961 new file mode

[tor-commits] [tor/master] Add an AccountingRule feature to permit limiting bw usage by read+write

2014-09-29 Thread nickm
commit 8527a2996675d9502551ccdd4224036a45aae47b Author: Nick Mathewson ni...@torproject.org Date: Tue Sep 23 08:34:22 2014 -0400 Add an AccountingRule feature to permit limiting bw usage by read+write Patch from chobe. Closes ticket 961. --- doc/tor.1.txt | 38

[tor-commits] [tor/master] Avoid frequent strcmp() calls for AccountingRule

2014-09-29 Thread nickm
commit 4903ab1caaf0b2631e6091b58b31eaff0c9f8424 Author: Nick Mathewson ni...@torproject.org Date: Tue Sep 23 08:46:35 2014 -0400 Avoid frequent strcmp() calls for AccountingRule Generally, we don't like to parse the same thing over and over; it's best IMO to do it once at the

[tor-commits] [tor/master] Merge branch 'ticket961_squashed'

2014-09-29 Thread nickm
commit 5e8cc766e6a4d297c66ff1afd6a5f8024607ef9c Merge: dc019b0 f15e5ae Author: Nick Mathewson ni...@torproject.org Date: Mon Sep 29 09:05:18 2014 -0400 Merge branch 'ticket961_squashed' changes/ticket961 |5 +++ doc/tor.1.txt | 38 ++

[tor-commits] [tor/master] Respond with 'Command not supported' SOCKS5 reply message upon reception of unsupported request.

2014-09-29 Thread nickm
commit c5ad890904b68596d1081ce92307f57e67a5e3e4 Author: rl1987 rl1...@sdf.lonestar.org Date: Sun Sep 21 19:17:44 2014 +0300 Respond with 'Command not supported' SOCKS5 reply message upon reception of unsupported request. --- changes/bug12971 |5 + src/or/buffers.c | 20

[tor-commits] [tor/master] Rename socks5 error code setting function again

2014-09-29 Thread nickm
commit fcebc8da95af5ccb28d715a6897566ea1c190a03 Author: Nick Mathewson ni...@torproject.org Date: Mon Sep 29 09:17:20 2014 -0400 Rename socks5 error code setting function again I'd prefer not to use the name send for any function that doesn't really send things. ---

[tor-commits] [tor/master] Merge branch 'bug12971_take2_squashed'

2014-09-29 Thread nickm
commit 11ebbf5e88a55c15bdec0d16f0f60b24ee747fc9 Merge: 5e8cc76 fcebc8d Author: Nick Mathewson ni...@torproject.org Date: Mon Sep 29 09:18:03 2014 -0400 Merge branch 'bug12971_take2_squashed' changes/bug12971 |5 + src/or/buffers.c | 20

[tor-commits] [tor/master] Note when 13291 was introduced.

2014-09-29 Thread nickm
commit ba7b6246b7dc6d75ccf28329c41ea1d688123127 Author: Nick Mathewson ni...@torproject.org Date: Mon Sep 29 09:40:33 2014 -0400 Note when 13291 was introduced. --- changes/bug13291-spawn-test-race-condition |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [tor/master] Whitespace fixes on 13291 fix

2014-09-29 Thread nickm
commit 15b0bf0aad53655a22430dbdf7d23f1f273f0877 Author: Nick Mathewson ni...@torproject.org Date: Mon Sep 29 09:39:21 2014 -0400 Whitespace fixes on 13291 fix --- src/test/test_util.c |8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/test_util.c

[tor-commits] [tor/master] Stop spawn test failures due to a race condition with SIGCHLD on process exit

2014-09-29 Thread nickm
commit b827a08284230bb1a08ddd7eff258d2b690d6793 Author: teor teor2...@gmail.com Date: Mon Sep 29 21:50:17 2014 +1000 Stop spawn test failures due to a race condition with SIGCHLD on process exit When a spawned process forks, fails, then exits very quickly, (this typically

[tor-commits] [tor/master] Parenthesize macro arguments for 13291 fix

2014-09-29 Thread nickm
commit 0a985af072812354742159777bea8577889c Author: Nick Mathewson ni...@torproject.org Date: Mon Sep 29 09:38:50 2014 -0400 Parenthesize macro arguments for 13291 fix --- src/test/test_util.c | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git

[tor-commits] [tor/master] Avoid division by zero in circuitstats pareto

2014-09-29 Thread nickm
commit 4d0ad34a92dff2be0b23e75ca5373054a5c9334a Author: teor teor2...@gmail.com Date: Mon Sep 29 20:24:40 2014 +1000 Avoid division by zero in circuitstats pareto In circuit_build_times_calculate_timeout() in circuitstats.c, avoid dividing by zero in the pareto calculations.

[tor-commits] [tor/master] Merge remote-tracking branch 'teor/circuitstats-pareto-avoid-div-zero'

2014-09-29 Thread nickm
commit 2b1b1def46395de573902169404238d38ce3070e Merge: ba7b624 4d0ad34 Author: Nick Mathewson ni...@torproject.org Date: Mon Sep 29 09:48:02 2014 -0400 Merge remote-tracking branch 'teor/circuitstats-pareto-avoid-div-zero' changes/bug13290-avoid-div-zero-circuitstatus-pareto |5 +

[tor-commits] [tor/master] Note when 13290 was introduced.

2014-09-29 Thread nickm
commit 18f2bfb8c3328df4b001b963e8b5e2aa44b264fa Author: Nick Mathewson ni...@torproject.org Date: Mon Sep 29 09:50:27 2014 -0400 Note when 13290 was introduced. --- changes/bug13290-avoid-div-zero-circuitstatus-pareto |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [tor/master] Automake syntax error :/

2014-09-29 Thread nickm
commit a0be2f1350bf4974a9655421c3b30ba87a7b2279 Author: Nick Mathewson ni...@torproject.org Date: Mon Sep 29 10:10:37 2014 -0400 Automake syntax error :/ --- src/ext/include.am |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ext/include.am b/src/ext/include.am

[tor-commits] [tor/master] Add missing ed25519_ref10 headers to NOINST_HEADERS.

2014-09-29 Thread nickm
commit 9455f45ae3b1fb27c072682caebfb6aed808441c Author: Nick Mathewson ni...@torproject.org Date: Mon Sep 29 10:10:08 2014 -0400 Add missing ed25519_ref10 headers to NOINST_HEADERS. --- src/ext/include.am | 11 ++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git

[tor-commits] [translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties

2014-09-29 Thread translation
commit 2ffc36f5536011f3e1b4f1d1c591f031e35e7196 Author: Translation commit bot translat...@torproject.org Date: Mon Sep 29 15:46:03 2014 + Update translations for torbutton-torbuttonproperties --- eu/torbutton.properties | 12 ++-- 1 file changed, 6 insertions(+), 6

[tor-commits] [tor/maint-0.2.5] Merge branch 'bug13295_v2_025' into maint-0.2.5

2014-09-29 Thread nickm
commit e1a25f0c3602e007872277ef9ab437cc97cfd47b Merge: 87576e8 09951be Author: Nick Mathewson ni...@torproject.org Date: Mon Sep 29 13:02:35 2014 -0400 Merge branch 'bug13295_v2_025' into maint-0.2.5 changes/13295 |5 + src/common/sandbox.c| 21

[tor-commits] [tor/maint-0.2.5] Don't use the getaddrinfo sandbox cache from tor-resolve

2014-09-29 Thread nickm
commit 09951bea7fe30cd91d8a4dee95278218f0aa199e Author: Nick Mathewson ni...@torproject.org Date: Mon Sep 29 12:57:07 2014 -0400 Don't use the getaddrinfo sandbox cache from tor-resolve Fixes bug 13295; bugfix on 0.2.5.3-alpha. The alternative here is to call

[tor-commits] [tor/master] Don't use the getaddrinfo sandbox cache from tor-resolve

2014-09-29 Thread nickm
commit 09951bea7fe30cd91d8a4dee95278218f0aa199e Author: Nick Mathewson ni...@torproject.org Date: Mon Sep 29 12:57:07 2014 -0400 Don't use the getaddrinfo sandbox cache from tor-resolve Fixes bug 13295; bugfix on 0.2.5.3-alpha. The alternative here is to call

[tor-commits] [tor/master] Merge branch 'bug13295_v2_025' into maint-0.2.5

2014-09-29 Thread nickm
commit e1a25f0c3602e007872277ef9ab437cc97cfd47b Merge: 87576e8 09951be Author: Nick Mathewson ni...@torproject.org Date: Mon Sep 29 13:02:35 2014 -0400 Merge branch 'bug13295_v2_025' into maint-0.2.5 changes/13295 |5 + src/common/sandbox.c| 21

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

2014-09-29 Thread nickm
commit 2e607ff51931b35ee531fa60b83487b3f4f944a7 Merge: a0be2f1 e1a25f0 Author: Nick Mathewson ni...@torproject.org Date: Mon Sep 29 13:02:50 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' changes/13295 |5 + src/common/sandbox.c| 21

[tor-commits] [meek/master] Rewrite 'errors.New(fmt.Sprintf(...)) - fmt.Errorf(...)'.

2014-09-29 Thread dcf
commit fe4c33126c8783caa032cd822769c6b49529bed9 Author: David Fifield da...@bamsoftware.com Date: Mon Sep 29 10:05:41 2014 -0700 Rewrite 'errors.New(fmt.Sprintf(...)) - fmt.Errorf(...)'. gofmt -l -w -r 'errors.New(fmt.Sprintf(a)) - fmt.Errorf(a)' ./appengine ./meek-server

[tor-commits] [meek/master] Simplify with gofmt -s.

2014-09-29 Thread dcf
commit ea6c955744eeb77c91c10e90af308b772ba19670 Author: David Fifield da...@bamsoftware.com Date: Mon Sep 29 09:58:58 2014 -0700 Simplify with gofmt -s. gofmt -l -w -s . --- meek-client/helper_test.go | 34 +- 1 file changed, 17 insertions(+), 17

[tor-commits] [meek/master] Don't show error text that may contain public IPs.

2014-09-29 Thread dcf
commit 05f244a5bfa137da662a8296a34f13e58aa23137 Author: David Fifield da...@bamsoftware.com Date: Mon Sep 29 10:18:36 2014 -0700 Don't show error text that may contain public IPs. The error messages looked like these: 2014/09/28 22:33:46 copying body to ORPort: write tcp

[tor-commits] [tor/master] continue our habit of specifying the default in the manpage

2014-09-29 Thread arma
commit e440993f95fad6d5a049be83517c8586fff7ab21 Author: Roger Dingledine a...@torproject.org Date: Mon Sep 29 13:33:50 2014 -0400 continue our habit of specifying the default in the manpage --- doc/tor.1.txt |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [tor/master] Clear the cached address from resolve_my_address() when our IP changes

2014-09-29 Thread nickm
commit b448ec195dd8687d2d5f363e12fec046eb2d1677 Author: Nick Mathewson ni...@torproject.org Date: Mon Sep 29 13:46:30 2014 -0400 Clear the cached address from resolve_my_address() when our IP changes Closes 11582; patch from ra. --- changes/ticket11582 |5 +

[tor-commits] [oonib/master] Add support for specifying the format of report filenames and directories in the archive.

2014-09-29 Thread art
commit 33b953312a5244afd6295788304faab822cdbaf6 Author: Arturo Filastò a...@fuffa.org Date: Mon Sep 29 13:02:53 2014 +0200 Add support for specifying the format of report filenames and directories in the archive. This implements:

[tor-commits] [oonib/master] Set default report file path to include country code.

2014-09-29 Thread art
commit 74494091a09bc392d767ded9ff3af26b4e69a7e9 Author: Arturo Filastò a...@fuffa.org Date: Mon Sep 29 13:42:25 2014 +0200 Set default report file path to include country code. Fix calling of report_file_name --- oonib/report/handlers.py |2 +- oonib/test/test_report.py |

[tor-commits] [oonib/master] Write to a tor logfile

2014-09-29 Thread art
commit 93edf6df743f263c79567ce15a76c5baf9d2d7f2 Author: Arturo Filastò a...@fuffa.org Date: Sat Sep 20 15:02:04 2014 +0200 Write to a tor logfile --- oonib/onion.py |3 +++ 1 file changed, 3 insertions(+) diff --git a/oonib/onion.py b/oonib/onion.py index 1950a41..9c94d02 100644 ---

[tor-commits] [oonib/master] Minor cleanup of bouncer handlers.

2014-09-29 Thread art
commit 764993d66fe8e091c86300eb3d6308aa3f070758 Author: Arturo Filastò a...@fuffa.org Date: Mon Sep 29 13:21:00 2014 +0200 Minor cleanup of bouncer handlers. --- oonib/bouncer/handlers.py | 20 ++-- 1 file changed, 14 insertions(+), 6 deletions(-) diff --git

[tor-commits] [ooni-probe/master] Add tests to verify if ooniprobe will work with the various versions of Twisted we are supposed to support.

2014-09-29 Thread art
commit 959c49b027d8c71e511a23bb095fdc371bed8bf8 Author: Arturo Filastò a...@fuffa.org Date: Thu Sep 18 10:53:36 2014 +0200 Add tests to verify if ooniprobe will work with the various versions of Twisted we are supposed to support. --- .travis.yml |8 ++-- 1 file changed, 6

[tor-commits] [ooni-probe/master] Set the datadirectory to be that of the repo.

2014-09-29 Thread art
commit 404d499877c050f706ca0f713d1c8ef0e5a9 Author: Arturo Filastò a...@fuffa.org Date: Mon Sep 29 14:10:49 2014 +0200 Set the datadirectory to be that of the repo. --- ooni/tests/bases.py |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ooni/tests/bases.py

[tor-commits] [ooni-probe/master] Randomly pick the socks and control port in test_settings.

2014-09-29 Thread art
commit 573eb77c3b268ae6cd9f052f5ff421d8ffc6a3cf Author: Arturo Filastò a...@fuffa.org Date: Mon Sep 29 13:34:49 2014 +0200 Randomly pick the socks and control port in test_settings. This fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=763264 ---

[tor-commits] [ooni-probe/master] Merge branch 'master' of github.com:TheTorProject/ooni-probe

2014-09-29 Thread art
commit 4c45d6d5bb1608b740ffc39af421ca8891d6767d Merge: 292b7f2 fe07c4a Author: Arturo Filastò a...@fuffa.org Date: Mon Sep 29 20:17:46 2014 +0200 Merge branch 'master' of github.com:TheTorProject/ooni-probe * 'master' of github.com:TheTorProject/ooni-probe: Override skipTest

[tor-commits] [ooni-probe/master] Polyfill the connectProtocol to fix compatibility with Twisted 12.2

2014-09-29 Thread art
commit 12cac3d21b8a3c8182e59958bc47219b40d926c3 Author: Arturo Filastò a...@fuffa.org Date: Thu Sep 18 11:01:19 2014 +0200 Polyfill the connectProtocol to fix compatibility with Twisted 12.2 --- ooni/settings.py |4 ++-- ooni/utils/net.py | 10 ++ 2 files changed, 12

[tor-commits] [ooni-probe/master] Determine the sample config dynamically and not from self.data_directory

2014-09-29 Thread art
commit 292b7f28e210414195cd23c7f47d1d381019d934 Author: Arturo Filastò a...@fuffa.org Date: Mon Sep 29 14:21:11 2014 +0200 Determine the sample config dynamically and not from self.data_directory Call setUp also in test_nettest and test_oonicli --- ooni/settings.py |

[tor-commits] [ooni-probe/master] Override skipTest so that it does not produce an error inside of twisted 12.2

2014-09-29 Thread art
commit f467b3f5f8203b15579675e9e3a910c077efbba5 Author: Arturo Filastò a...@fuffa.org Date: Thu Sep 18 11:33:05 2014 +0200 Override skipTest so that it does not produce an error inside of twisted 12.2 --- ooni/tests/bases.py |5 - 1 file changed, 4 insertions(+), 1 deletion(-)

[tor-commits] [ooni-probe/master] Pep8 fixes

2014-09-29 Thread art
commit 78b53680443a694cb06470d0a9b75d607b84887e Author: Arturo Filastò a...@fuffa.org Date: Mon Sep 29 13:34:32 2014 +0200 Pep8 fixes --- ooni/tests/test_settings.py |7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ooni/tests/test_settings.py

[tor-commits] [ooni-probe/master] Merge pull request #352 from TheTorProject/feature/regression_testing

2014-09-29 Thread art
commit fe07c4ade0d706963b3f9324c6c6ccf4b98df9b3 Merge: 436a232 f467b3f Author: Arturo Filastò art...@filasto.net Date: Wed Sep 24 10:46:11 2014 +0200 Merge pull request #352 from TheTorProject/feature/regression_testing Feature/regression testing .travis.yml |8

[tor-commits] [oonib/master] update oonibackend to 1.1.3

2014-09-29 Thread art
commit a20bf774592c318d1aa5f842eb79b5ea959f7a82 Author: Arturo Filastò a...@fuffa.org Date: Mon Sep 29 20:12:15 2014 +0200 update oonibackend to 1.1.3 --- ChangeLog.rst |7 +++ oonib/__init__.py |2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git

[tor-commits] r26961: {website} update mirror status. (website/trunk/include)

2014-09-29 Thread Andrew Lewman
Author: phobos Date: 2014-09-29 23:44:20 + (Mon, 29 Sep 2014) New Revision: 26961 Modified: website/trunk/include/mirrors-table.wmi website/trunk/include/tor-mirrors.csv Log: update mirror status. Modified: website/trunk/include/mirrors-table.wmi

[tor-commits] r26962: {website} remove cryptowars by maintainer request (website/trunk/include)

2014-09-29 Thread Andrew Lewman
Author: phobos Date: 2014-09-30 00:18:54 + (Tue, 30 Sep 2014) New Revision: 26962 Modified: website/trunk/include/tor-mirrors.csv Log: remove cryptowars by maintainer request Modified: website/trunk/include/tor-mirrors.csv

[tor-commits] [torbutton/master] Merge remote-tracking branch 'brade/bug13138'

2014-09-29 Thread mikeperry
commit f82606e56c30ee7db9e6160719ef858b7b9c1e10 Merge: 7f46869 0467379 Author: Mike Perry mikeperry-...@torproject.org Date: Mon Sep 29 17:06:48 2014 -0700 Merge remote-tracking branch 'brade/bug13138' src/chrome/content/aboutTor/aboutTor.xhtml |7 -

[tor-commits] [torbutton/master] Bug 13138: ESR31-about:tor shows Tor is not working

2014-09-29 Thread mikeperry
commit 0467379f524273ed810b5c21d6a8eb16d00445cb Author: Kathy Brade br...@pearlcrescent.com Date: Thu Sep 11 14:10:55 2014 -0400 Bug 13138: ESR31-about:tor shows Tor is not working In Firefox 26 and newer, the BrowserOnAboutPageLoad() function that Torbutton previously used to

[tor-commits] [torbutton/master] Bug #10751.1: Load HUDService only if it's not already available.

2014-09-29 Thread mikeperry
commit f5095267fcc638bd5ded6f9934e31d98505a6247 Author: Arthur Edelstein arthuredelst...@gmail.com Date: Mon Aug 25 15:50:19 2014 -0700 Bug #10751.1: Load HUDService only if it's not already available. Loading by this method breaks the browser console in ESR31. Fortunately,

[tor-commits] [torbutton/master] Update changelog and version for 1.7.0.0-pre.

2014-09-29 Thread mikeperry
commit 3f80c17eb67f2836c1652f43f693e0a99c152747 Author: Mike Perry mikeperry-...@torproject.org Date: Mon Sep 29 17:22:56 2014 -0700 Update changelog and version for 1.7.0.0-pre. --- src/CHANGELOG |5 + src/install.rdf |2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

[tor-commits] [torbutton/master] Bug #10751.2: Adapt Torbutton to Australis UI.

2014-09-29 Thread mikeperry
commit 4024c6ff958724d226a5a30b68316b25fb876616 Author: Arthur Edelstein arthuredelst...@gmail.com Date: Mon Aug 25 16:46:54 2014 -0700 Bug #10751.2: Adapt Torbutton to Australis UI. Use CustomizableUI, if it is available, to add TorButton's button to navigation toolbar. ---

[tor-commits] [torbutton/master] Bug 12947: Adapt session storage blocker to ESR 31.

2014-09-29 Thread mikeperry
commit 3831da21b6bac9e6cf21ba7d4e48217a6b14e73a Author: Georg Koppen g...@torproject.org Date: Fri Sep 5 16:12:23 2014 + Bug 12947: Adapt session storage blocker to ESR 31. --- src/components/tbSessionStore.js | 11 +-- 1 file changed, 9 insertions(+), 2 deletions(-) diff

[tor-commits] [torbutton/master] Update changelog.

2014-09-29 Thread mikeperry
commit beb9d71b5a101523474e9c72ff75419065ccd326 Author: Mike Perry mikeperry-...@torproject.org Date: Mon Sep 29 17:25:37 2014 -0700 Update changelog. --- src/CHANGELOG |1 + 1 file changed, 1 insertion(+) diff --git a/src/CHANGELOG b/src/CHANGELOG index 11c50a7..74e95fe 100644 ---

[tor-commits] [torbutton/master] Merge remote-tracking branch 'gk/bug_12947'

2014-09-29 Thread mikeperry
commit fd5b793ce1d1922411cf632bd0a53139e26efdc8 Merge: 3f80c17 3831da2 Author: Mike Perry mikeperry-...@torproject.org Date: Mon Sep 29 17:25:27 2014 -0700 Merge remote-tracking branch 'gk/bug_12947' src/components/tbSessionStore.js | 11 +-- 1 file changed, 9 insertions(+), 2

[tor-commits] [tor-browser-bundle/master] Bug #12873: Re-enable TLSv1.1 and v1.2 for Meek.

2014-09-29 Thread mikeperry
commit 11d174291621350e9f5524ee416c74597ccef660 Author: Mike Perry mikeperry-...@torproject.org Date: Mon Sep 29 18:26:42 2014 -0700 Bug #12873: Re-enable TLSv1.1 and v1.2 for Meek. --- Bundle-Data/PTConfigs/meek-http-helper-user.js |8 1 file changed, 8 deletions(-) diff

[tor-commits] [tor-browser-bundle/master] Point nightlies at FF31ESR.

2014-09-29 Thread mikeperry
commit d6cbef12af2a177cb8d715c00bc9c3f1fa81f5b5 Author: Mike Perry mikeperry-...@torproject.org Date: Mon Sep 29 17:53:39 2014 -0700 Point nightlies at FF31ESR. --- gitian/versions.nightly |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.nightly

[tor-commits] [tor-browser/tor-browser-31.1.1esr-4.x-1] fixup! TB4: Tor Browser's Firefox preference overrides.

2014-09-29 Thread mikeperry
commit 3a25e7d56006b2ddfcd30cd310df87d9e09f6d3c Author: Mike Perry mikeperry-...@torproject.org Date: Mon Sep 29 18:34:57 2014 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. Bug 13023: Disable the gamepad API. --- browser/app/profile/000-tor-browser.js |1 + 1

[tor-commits] [torbutton/master] Update changelog.

2014-09-29 Thread mikeperry
commit 6cbdecfce8649b334c05c45689d9e660b6032fb9 Author: Mike Perry mikeperry-...@torproject.org Date: Mon Sep 29 18:44:45 2014 -0700 Update changelog. --- src/CHANGELOG |1 + 1 file changed, 1 insertion(+) diff --git a/src/CHANGELOG b/src/CHANGELOG index 74e95fe..0d68ab6 100644 ---

[tor-commits] [torbutton/master] Merge remote-tracking branch 'gk/bug_10716_v2'

2014-09-29 Thread mikeperry
commit eac0d3eefa335b8648acf5ca785cc56224e3dd9e Merge: beb9d71 ca82201 Author: Mike Perry mikeperry-...@torproject.org Date: Mon Sep 29 18:44:23 2014 -0700 Merge remote-tracking branch 'gk/bug_10716_v2' src/components/external-app-blocker.js | 31 +-- 1 file

[tor-commits] [torbutton/master] Bug 10716: Take care of drag/drop events in ESR 31.

2014-09-29 Thread mikeperry
commit ca8220118f1e3ac3ed190cc15f1091f285cf299a Author: Georg Koppen g...@torproject.org Date: Thu Sep 18 13:14:36 2014 + Bug 10716: Take care of drag/drop events in ESR 31. --- src/components/external-app-blocker.js | 31 +-- 1 file changed, 29

[tor-commits] [torbutton/master] Comment that the on-datatransfer-available API is the new one.

2014-09-29 Thread mikeperry
commit 6961e6b8ccd8846638be39a426f42c61f013fc47 Author: Mike Perry mikeperry-...@torproject.org Date: Mon Sep 29 18:46:33 2014 -0700 Comment that the on-datatransfer-available API is the new one. --- src/components/external-app-blocker.js |2 ++ 1 file changed, 2 insertions(+) diff

[tor-commits] [translation/liveusb-creator_completed] Update translations for liveusb-creator_completed

2014-09-29 Thread translation
commit bd25b36537e53be89fd755d905ba2017099b4004 Author: Translation commit bot translat...@torproject.org Date: Tue Sep 30 05:45:33 2014 + Update translations for liveusb-creator_completed --- cs/cs.po | 272 ++ 1 file

[tor-commits] [translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties

2014-09-29 Thread translation
commit 0e6f1c3223884a64a02584b47f2f008701e1dac3 Author: Translation commit bot translat...@torproject.org Date: Tue Sep 30 05:46:16 2014 + Update translations for torbutton-torbuttonproperties --- cs/torbutton.properties |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

2014-09-29 Thread translation
commit 545a7bb9e2b39ff170b5111b224d9f9d63395c57 Author: Translation commit bot translat...@torproject.org Date: Tue Sep 30 05:45:25 2014 + Update translations for liveusb-creator --- cs/cs.po | 62 +++--- 1 file changed, 31

[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings

2014-09-29 Thread translation
commit 6643bf5813d3f4774c7dbf4c0bbcd6d8faa482dc Author: Translation commit bot translat...@torproject.org Date: Tue Sep 30 05:45:56 2014 + Update translations for tor-launcher-network-settings --- cs/network-settings.dtd |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff