[tor-commits] [webwml/master] Bump TBB version to fix 404.

2015-01-13 Thread mikeperry
commit b238c22b8f850ff9b4f619bb7db31343ea0a8bfc Author: Mike Perry mikeperry-...@torproject.org Date: Tue Jan 13 21:33:20 2015 -0800 Bump TBB version to fix 404. --- include/versions.wmi | 10 +- projects/torbrowser/RecommendedTBBVersions |4 2

[tor-commits] [webwml/master] 4.0.2 is not recommended anymore

2015-01-13 Thread gk
commit 26eade65d132af8b75a40ff3b8ca8596345d4c48 Author: Georg Koppen g...@torproject.org Date: Wed Jan 14 07:18:16 2015 + 4.0.2 is not recommended anymore --- projects/torbrowser/RecommendedTBBVersions |4 1 file changed, 4 deletions(-) diff --git

[tor-commits] [tor-browser-spec/master] Try to avoid bad version info and 404s.

2015-01-13 Thread mikeperry
commit 3b9f0cb149da1a3567790d86dd0a9f652c19ff5e Author: Mike Perry mikeperry-...@torproject.org Date: Tue Jan 13 22:11:51 2015 -0800 Try to avoid bad version info and 404s. Make it clear that we need to update the version info right after putting up binaries, and that we should

[tor-commits] [tor/master] Bring sanity to connection_listener_new()

2015-01-13 Thread nickm
commit 2ca1c386b0d1c396fa8d8f4b5334349e24a2f9e8 Author: Andrea Shepard and...@torproject.org Date: Wed Jan 7 22:51:24 2015 + Bring sanity to connection_listener_new() --- src/or/connection.c | 200 +-- 1 file changed, 66 insertions(+),

[tor-commits] [tor/master] whitespace fix

2015-01-13 Thread nickm
commit 2b8cebaac0232e2ca2fd09ffa3225d7550cb54a3 Author: Nick Mathewson ni...@torproject.org Date: Tue Jan 13 13:11:39 2015 -0500 whitespace fix --- src/or/dirserv.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index

[tor-commits] [tor/master] Document disable option for ControlSocket and SocksSocket

2015-01-13 Thread nickm
commit 78956f5d857f573106fd4dd4d2f9220af32be1b3 Author: Andrea Shepard and...@torproject.org Date: Fri Jan 9 20:54:59 2015 + Document disable option for ControlSocket and SocksSocket --- doc/tor.1.txt |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git

[tor-commits] [tor/master] Fix default list handling for parse_unix_socket_config(); avoid clearing whole pre-existing list

2015-01-13 Thread nickm
commit f50068b17e77f9749fe798ef46124baa811d5b0a Author: Andrea Shepard and...@torproject.org Date: Mon Jan 12 22:12:18 2015 + Fix default list handling for parse_unix_socket_config(); avoid clearing whole pre-existing list --- src/or/config.c | 70

[tor-commits] [tor/master] Merge remote-tracking branch 'andrea/ticket12585_v3'

2015-01-13 Thread nickm
commit d8b7dcca8de8894c147571dd3e259f00a708e348 Merge: 732c885 066acaf Author: Nick Mathewson ni...@torproject.org Date: Tue Jan 13 12:50:55 2015 -0500 Merge remote-tracking branch 'andrea/ticket12585_v3' changes/bug12585 |9 doc/tor.1.txt| 11 +++-

[tor-commits] [tor/master] update bug12585 changes file

2015-01-13 Thread nickm
commit 8d1fa0c87dd84f7f2ce7f9429140f1282330fce8 Author: Nick Mathewson ni...@torproject.org Date: Tue Jan 13 13:13:19 2015 -0500 update bug12585 changes file --- changes/bug12585 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug12585 b/changes/bug12585

[tor-commits] [tor/master] Commit second draft of Jake's SOCKS5-over-AF_UNIX patch. See ticket #12585.

2015-01-13 Thread nickm
commit 8d59ddf3cba541c6578dff121e8f0623a7606bab Author: Jacob Appelbaum ja...@appelbaum.net Date: Mon Aug 11 12:27:04 2014 -0700 Commit second draft of Jake's SOCKS5-over-AF_UNIX patch. See ticket #12585. Signed-off-by: Andrea Shepard and...@torproject.org --- changes/bug12585

[tor-commits] [tor/master] Refactor check_location_for_unix_socket()/check_location_for_socks_unix_socket() to eliminate duplicated code

2015-01-13 Thread nickm
commit c6451e4c9f2e36f447b4da7d91403a16dde4d2e7 Author: Andrea Shepard and...@torproject.org Date: Wed Jan 7 19:17:04 2015 + Refactor check_location_for_unix_socket()/check_location_for_socks_unix_socket() to eliminate duplicated code --- src/or/connection.c | 98

[tor-commits] [tor/master] Add support for a default list of paths and passing '0' to disable it to parse_unix_socket_config()

2015-01-13 Thread nickm
commit 0729b2be535df8a114c6c219e90aa3258caefcdb Author: Andrea Shepard and...@torproject.org Date: Fri Jan 9 20:49:54 2015 + Add support for a default list of paths and passing '0' to disable it to parse_unix_socket_config() --- src/or/config.c | 58

[tor-commits] [tor/master] Downgrade open/close log message for SocksSocket

2015-01-13 Thread nickm
commit a3bcde3638d035303a9a5bf8373c1b841a1f5636 Author: Andrea Shepard and...@torproject.org Date: Wed Jan 7 22:57:51 2015 + Downgrade open/close log message for SocksSocket --- src/or/connection.c |2 +- src/or/main.c |2 +- 2 files changed, 2 insertions(+), 2

[tor-commits] [tor/master] Rename is_tcp in connection_listener_new(), since AF_UNIX means SOCK_STREAM no longer implies TCP

2015-01-13 Thread nickm
commit 48633c07660216d3b852b609c44fa318d55908f0 Author: Andrea Shepard and...@torproject.org Date: Wed Jan 7 19:45:59 2015 + Rename is_tcp in connection_listener_new(), since AF_UNIX means SOCK_STREAM no longer implies TCP --- src/or/connection.c | 10 +- 1 file changed, 5

[tor-commits] [tor/master] Explicitly chmod AF_UNIX sockets to 0600 when *GroupWritable isn't specified

2015-01-13 Thread nickm
commit 066acaf6b9e5c38fc392e85c14457f338d3c1dff Author: Andrea Shepard and...@torproject.org Date: Tue Jan 13 00:27:04 2015 + Explicitly chmod AF_UNIX sockets to 0600 when *GroupWritable isn't specified --- src/or/connection.c | 10 ++ 1 file changed, 10 insertions(+) diff

[tor-commits] [tor/master] Kill duplicated code in connection_listener_new()

2015-01-13 Thread nickm
commit 62f297fff062afa5aabfb5cd5152897a1ca4591b Author: Andrea Shepard and...@torproject.org Date: Mon Jan 12 16:26:34 2015 + Kill duplicated code in connection_listener_new() --- src/or/connection.c | 16 1 file changed, 4 insertions(+), 12 deletions(-) diff --git

[tor-commits] [tor/master] Fix ipv4/ipv6 traffic bits on AF_UNIX socks listeners and remove hacky workarounds for brokenness

2015-01-13 Thread nickm
commit cb047f40786bf87f7fb17a500ca35eca9ba34f7c Author: Andrea Shepard and...@torproject.org Date: Tue Jan 13 00:18:17 2015 + Fix ipv4/ipv6 traffic bits on AF_UNIX socks listeners and remove hacky workarounds for brokenness --- src/or/config.c | 14 ++

[tor-commits] [tor/master] Remove no-longer-accurate comment from connection.c

2015-01-13 Thread nickm
commit 4316bb601a95ebe6e8353cc0a795605889039fe3 Author: Andrea Shepard and...@torproject.org Date: Tue Jan 13 00:21:59 2015 + Remove no-longer-accurate comment from connection.c --- src/or/connection.c |2 -- 1 file changed, 2 deletions(-) diff --git a/src/or/connection.c

[tor-commits] [tor/master] Fix new unused variable warning in connection_listener_new

2015-01-13 Thread nickm
commit 17c568b95cddeab7bfd4bcd388c1e5735bef4ed1 Author: Nick Mathewson ni...@torproject.org Date: Tue Jan 13 13:45:35 2015 -0500 Fix new unused variable warning in connection_listener_new --- src/or/connection.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

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

2015-01-13 Thread translation
commit d72bfafcc35fd4c79d4c9eba899c60e217d82623 Author: Translation commit bot translat...@torproject.org Date: Tue Jan 13 09:15:46 2015 + Update translations for torbutton-torbuttondtd --- cs/torbutton.dtd |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git

[tor-commits] [torbutton/master] Bug #13078: environment variable to skip TorButton control port verification

2015-01-13 Thread gk
commit 38a59e819604de5018db5db54fb08fd9e1581d1f Author: Patrick Schleizer adrela...@riseup.net Date: Sun Sep 7 20:49:41 2014 + Bug #13078: environment variable to skip TorButton control port verification --- src/chrome/content/torbutton.js |4 1 file changed, 4 insertions(+)

[tor-commits] [torbutton/master] Bug 14100: Add option to hide NetworkSettings

2015-01-13 Thread gk
commit 765fee607af6fa88b99476dee10298e5db3b9eb1 Author: Georg Koppen g...@torproject.org Date: Tue Jan 13 09:36:35 2015 + Bug 14100: Add option to hide NetworkSettings This patch hides the NetworkSettings menuitem if the environment variable TOR_NO_DISPLAY_NETWORK_SETTINGS

[tor-commits] [tor-browser-bundle/master] Merge remote-tracking branch 'boklm/ticket_13015_v2'

2015-01-13 Thread gk
commit 0ca8d445690515e053e3dfbdaaf3b683b1021431 Merge: 5401e06 28e1585 Author: Georg Koppen g...@torproject.org Date: Tue Jan 13 15:09:56 2015 + Merge remote-tracking branch 'boklm/ticket_13015_v2' gitian/check-match.sh | 25 +++-- gitian/get-tb-version |

[tor-commits] [tor-browser-bundle/master] Bug #13015: use git tags to set tor-browser version

2015-01-13 Thread gk
commit 28e1585aff3e8dd8d15ef7a7add7f95508e9a50b Author: Nicolas Vigier bo...@torproject.org Date: Mon Oct 27 18:00:01 2014 +0100 Bug #13015: use git tags to set tor-browser version This commit adds a get-tb-version script which uses the git tags to output the Tor Browser

[tor-commits] [tor-browser-spec/master] Bug 13857: Updates per channel.

2015-01-13 Thread mikeperry
commit a0437baecf5fa3de901c01ad73ee7f132ecc0050 Author: Georg Koppen g...@torproject.org Date: Thu Jan 8 15:53:35 2015 + Bug 13857: Updates per channel. Update XML files are now created per channel. This means we need to upload only channel-related XML files and, as the

[tor-commits] [tor-browser-spec/master] release process: generate update responses

2015-01-13 Thread mikeperry
commit 84fb90a8ec53f4876efa21615d75a6c7c58b6bd9 Author: Nicolas Vigier bo...@torproject.org Date: Thu Jan 8 16:21:38 2015 +0100 release process: generate update responses The update responses used to be created at the same time as incremental MARs are generated, but since

[tor-commits] [tor-browser-spec/master] Fix relative path for update signing.

2015-01-13 Thread mikeperry
commit ec60e6dad08429183ce5c73797c3fcd17735f856 Author: Mike Perry mikeperry-...@torproject.org Date: Tue Jan 13 06:08:24 2015 -0800 Fix relative path for update signing. --- processes/ReleaseProcess |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [tor-launcher/master] Remove superfluous whitespace.

2015-01-13 Thread gk
commit 0717ad71785545ec167c531d60b5410a19ebbc1a Author: Georg Koppen g...@torproject.org Date: Tue Jan 13 10:03:50 2015 + Remove superfluous whitespace. --- src/chrome/content/network-settings.js |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [tor-launcher/master] Bug 14122: Hide logo if TOR_HIDE_BROWSER_LOGO set.

2015-01-13 Thread gk
commit c1ee486489e33bb07164448b096afba5d899f661 Author: Kathy Brade br...@pearlcrescent.com Date: Mon Jan 12 17:39:45 2015 -0500 Bug 14122: Hide logo if TOR_HIDE_BROWSER_LOGO set. If the TOR_HIDE_BROWSER_LOGO environment variable is set, hide Tor Browser logo within the network

[tor-commits] [doctor/master] Pretend maatuska isn't a bandwidth authority

2015-01-13 Thread atagar
commit 395e46b3bccd8ae10f46da8cf8ab5f7a52b054e0 Author: Damian Johnson ata...@torproject.org Date: Tue Jan 13 07:41:21 2015 -0800 Pretend maatuska isn't a bandwidth authority Linus asked us to stop sending alerts for his bandwidth authority. It has been having issues for quite

[tor-commits] [torbutton/master] Bug 13998: Bind volatilePrivatePermissions to disk

2015-01-13 Thread mikeperry
commit eb343e2cdcbd35ae6140543f248969a7e3b9aa8d Author: Georg Koppen g...@torproject.org Date: Tue Jan 13 10:57:00 2015 + Bug 13998: Bind volatilePrivatePermissions to disk We set `noscript.volatilePrivatePermissions` to `true` if disk records are disabled and otherwise to

[tor-commits] [torbutton/master] Bug 13998: Adapt code to fixed globalHttpsWhitelist

2015-01-13 Thread mikeperry
commit 915ec73bb2b556aa937a827fbe746b21dacec1f3 Author: Georg Koppen g...@torproject.org Date: Mon Jan 12 13:03:34 2015 + Bug 13998: Adapt code to fixed globalHttpsWhitelist --- src/chrome/content/torbutton.js | 29 ++--- 1 file changed, 18 insertions(+), 11

[tor-commits] [torbutton/master] Add changelog for 1.7.0.2 for historical archive.

2015-01-13 Thread mikeperry
commit 5848794c74c3dfa2421c0a2f413a12168cf802b8 Author: Mike Perry mikeperry-...@torproject.org Date: Tue Nov 25 16:28:48 2014 -0800 Add changelog for 1.7.0.2 for historical archive. --- src/CHANGELOG |4 1 file changed, 4 insertions(+) diff --git a/src/CHANGELOG b/src/CHANGELOG

[tor-commits] [torbutton/master] Try to make the security slider less eager to switch to custom.

2015-01-13 Thread mikeperry
commit 7975b2023d5dc9bc0437cb5d5fbfe539448900e4 Author: Mike Perry mikeperry-...@torproject.org Date: Tue Jan 13 08:35:00 2015 -0800 Try to make the security slider less eager to switch to custom. We actually need to rewrite the entire check for the custom settings here, but