[tor-commits] [tor-browser-spec/master] Update notes based on GeKo's comments.
commit d25eeb661b9d4975a1a7868f07d333b5332d39dd Author: Mike Perry Date: Thu Oct 10 19:13:10 2019 -0500 Update notes based on GeKo's comments. --- audits/FF68_NETWORK_AUDIT | 12 +++- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/audits/FF68_NETWORK_AUDIT b/audits/FF68_NETWORK_AUDIT index f8965cb..93b0c9a 100644 --- a/audits/FF68_NETWORK_AUDIT +++ b/audits/FF68_NETWORK_AUDIT @@ -155,8 +155,9 @@ _SOCKET + Looks benign and also not new UDPSocket - - XXX: devtools debugger discovery still uses it + - devtools debugger discovery still uses it - ./devtools/shared/discovery/discovery.js ++ Disabled via pref in #18546 + webrtc moved code + dom.udpsocket.enabled still false - fallback multicastDNS uses it (not new) @@ -167,14 +168,15 @@ TCPSocket SocketTransport + IOactivityMonitor, NetworkActivityMonitor? (old) - - XXX: presentation control service? I think this is old but moved + - presentation control service? I think this is old but moved - dom/presentation/PresentationTCPSessionTransport.cpp - - App to app service.. + + Patched - Dashboard - netwerk/base/Dashboard.cpp + Only examine opened sockets and cached DNS - - XXX: Roku control (old) + - Roku control (old) - ./toolkit/modules/secondscreen/RokuApp.jsm + + patched - NetworkConnectivityService?? This looks new - ./netwerk/base/NetworkConnectivityService.cpp + Uses DNS service and nsIChannels.. Proxy safe @@ -228,7 +230,7 @@ Android Java calls + ch.boye.httpclientandroidlib.impl.client.* (look for execute() calls) + BaseResource.java (is this proxied? Who calls this?) + Lots of consumers.. - - XXX: Patch going back in: https://bugs.torproject.org/31934 + + Patch going back in: https://bugs.torproject.org/31934 + leanplum (disabled) + Adjust SDK uses execute directly + https://bugs.torproject.org/25906 disabled ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-spec/master] Add a sketch for how we've done the network audits so far.
commit caf16ac6759033b770b557c606fff09c5b7d9bf2 Author: Mike Perry Date: Thu Oct 10 19:01:25 2019 -0500 Add a sketch for how we've done the network audits so far. --- audits/NETWORK_AUDIT_RUBRIC | 88 + 1 file changed, 88 insertions(+) diff --git a/audits/NETWORK_AUDIT_RUBRIC b/audits/NETWORK_AUDIT_RUBRIC new file mode 100644 index 000..89ec61c --- /dev/null +++ b/audits/NETWORK_AUDIT_RUBRIC @@ -0,0 +1,88 @@ +`git diff esrA esrB` and then go over all the changes containing the +above mentioned potentially dangerous calls and features. Grep the diff for +the following strings and examine surrounding usage. + +=== Native DNS Portion = + +PR_GetHostByName +PR_GetIPNodeByName +PR_GetAddrInfoByName +PR_StringToNetAddr (itself is good as it passes AI_NUMERICHOST to getaddrinfo. No resolution.) + +MDNS +TRR (DNS Trusted Recursive Resolver) + +Direct Paths to DNS resolution: +nsDNSService::Resolve +nsDNSService::AsyncResolve +nsHostResolver::ResolveHost + + Misc Socket Portion == + +SOCK_ +SOCKET_ +_SOCKET +UDPSocket +TCPSocket + PR_NewTCPSocket + AsyncTCPSocket + +Misc PR_Socket + +=== Misc XPCOM Portion + +Misc XPCOM (including commands for pre-diff review approach) + *SocketProvider + grep -R udp-socket . + grep -R tcp-socket . + grep for tcpsocket + grep -R "NS_" | grep SOCKET | grep "_C" + grep -R "@mozilla.org/network/" . | grep socket | grep -v udp-socket + + Rust Portion + +Rust + - XXX: What do we grep for here? Or do we rely on Ritter's compile-time tool? + - Check for new sendmsg and recvmsg usage + + Android Portion = + +Android Java calls + - URLConnection + - XXX: getInputStream? other methods? + - HttpURLConnection + - UrlConnectionDownloader + - ch.boye.httpclientandroidlib.impl.client.* (look for execute() calls) + - grep -n openConnection\( mobile/android/thirdparty/ + - java.net.URL -- has SEVERAL proxy bypass URL fetching methods :/ + - java.net + - javax.net + - ch.boye.httpclientandroidlib.conn.* (esp ssl) + - ch.boye.httpclientandroidlib.impl.conn.* (esp ssl) + - Sudden appearance of thirdparty libs: + - OkHttp + - Retrofit + - Glide + - com.amitshekhar.android + - IntentHelper + - openUriExternal (can come from GeckoAppShell too) + - getHandlersForMimeType + - getHandlersForURL + - getHandlersForIntent + - android.content.Intent - too common; instead find launch methods: + - startActivity + - startActivities + - sendBroadcast + - sendOrderedBroadcast + - startService + - bindService + - android.app.PendingIntent + - android.app.DownloadManager + - ActivityHandlerHelper.startIntentAndCatch + + Regression/Prior Vuln Review = + +Review proxy bypass bugs; check for new vectors to look for: + - https://trac.torproject.org/projects/tor/query?keywords=~tbb-proxy + - Look for new features like these. Especially external app launch vectors + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-spec/master] Add Firefox 68 network audit notes
commit 8edeebec646e37161b78fabda6ab51f794df7fdb
Author: Mike Perry
Date: Thu Oct 10 19:02:02 2019 -0500
Add Firefox 68 network audit notes
---
audits/FF68_NETWORK_AUDIT | 311 ++
1 file changed, 311 insertions(+)
diff --git a/audits/FF68_NETWORK_AUDIT b/audits/FF68_NETWORK_AUDIT
new file mode 100644
index 000..f8965cb
--- /dev/null
+++ b/audits/FF68_NETWORK_AUDIT
@@ -0,0 +1,311 @@
+Things to grep for in general when investigating changes:
+
+=== Native DNS Portion =
+
+PR_GetHostByName
+PR_GetIPNodeByName
+PR_GetAddrInfoByName
+PR_StringToNetAddr (itself is good as it passes AI_NUMERICHOST to getaddrinfo.
No resolution.)
+
+MDNS
+TRR (DNS Trusted Recursive Resolver)
+
+Direct Paths to DNS resolution:
+nsDNSService::Resolve
+nsDNSService::AsyncResolve
+nsHostResolver::ResolveHost
+
+ Misc Socket Portion ==
+
+SOCK_
+SOCKET_
+_SOCKET
+UDPSocket
+TCPSocket
+ PR_NewTCPSocket
+ AsyncTCPSocket
+
+Misc PR_Socket
+
+=== Misc XPCOM Portion
+
+Misc XPCOM (including commands for pre-diff review approach)
+ *SocketProvider
+ grep -R udp-socket .
+ grep -R tcp-socket .
+ grep for tcpsocket
+ grep -R "NS_" | grep SOCKET | grep "_C"
+ grep -R "@mozilla.org/network/" . | grep socket | grep -v udp-socket
+
+ Rust Portion
+
+Rust
+ - XXX: What do we grep for here? Or do we rely on Ritter's compile-time tool?
+ - Check for new sendmsg and recvmsg usage
+
+ Android Portion =
+
+Android Java calls
+ - URLConnection
+ - XXX: getInputStream? other methods?
+ - HttpURLConnection
+ - UrlConnectionDownloader
+ - ch.boye.httpclientandroidlib.impl.client.* (look for execute() calls)
+ - grep -n openConnection\( mobile/android/thirdparty/
+ - java.net
+ - java.net.URL -- has SEVERAL proxy bypass URL fetching methods :/
+ - javax.net
+ - ch.boye.httpclientandroidlib.conn.* (esp ssl)
+ - ch.boye.httpclientandroidlib.impl.conn.* (esp ssl)
+ - Sudden appearance of thirdparty libs:
+ - OkHttp
+ - Retrofit
+ - Glide
+ - com.amitshekhar.android
+ - IntentHelper
+ - openUriExternal (can come from GeckoAppShell too)
+ - getHandlersForMimeType
+ - getHandlersForURL
+ - getHandlersForIntent
+ - android.content.Intent - too common; instead find launch methods:
+ - startActivity
+ - startActivities
+ - sendBroadcast
+ - sendOrderedBroadcast
+ - startService
+ - bindService
+ - android.app.PendingIntent
+ - android.app.DownloadManager
+ - ActivityHandlerHelper.startIntentAndCatch
+
+
+
+ Regression/Prior Vuln Review =
+
+Review proxy bypass bugs; check for new vectors to look for:
+ - https://trac.torproject.org/projects/tor/query?keywords=~tbb-proxy
+
+---
+I followed the diff approach by doing `git diff esr60 esr68` and then
+going over all the changes containing the above mentioned potentially dangerous
+calls and features.
+
+Direct Paths to DNS resolution:
+ + PR_GetHostByName
+ + No new cals in diff
+PR_GetIPNodeByName
+ + No new calls in diff
+PR_GetAddrInfoByName
+ + Edited calls in diff, but no change
+PR_StringToNetAddr (itself is good as it passes AI_NUMERICHOST to getaddrinfo.
No resolution.)
+ + One change in NSS unit tests ("127.0.0.1" to higher level call)
+
+MDNS:
+ + No substantive changes
+
+nsDNSService:
+ - nsDNSServiceDiscovery appears to support fallback JS mDNS option
++ nsDNSServiceDiscovery itself is not new..
+ + nsDNSService has an mProxyType now
+ - nsDNSService::AsyncResolveInternal()?
++ Patch blocks this (XXX: Maybe should move to PreprocessHostName)
++ nsDNSAsyncRequest
+- nHostResolver::ResolveHost
+ + not used outside dnsservice
+ + nsDNSService::ResolveInternal()
++ ResolveHost() with type now...
++ Patched
+ + AsyncResolve, AsyncResolveNative, AsyncResolveByType
++ AsyncResolveInternal()
+ + Patched
+ + Resolve()
++ ResolveNative
+ + ResolveInternal()
++ Patched
+ + What about our dns service patch? where did that go?
++
https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-browser-68.1.0esr-9.0-2&id=97b3893a5710229a4efaf009d1b1b80d9a3918f0
++
https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-browser-60.8.0esr-8.5-1&id=edd3fbf5af01a812c1f5e8e04731fa1abc52da7f
+nsHostResolver:
+ + Only used by DNS service
+
+
+SOCK_
+ + libvpx has unit tests that use sockets
+ + many changes due to moved webrtc code..
++ All disabled and not compiled in
+ + Lots of python unittests
+ + Sctp code has sockets.. Is this used?
++ by webrtc, which we disable
+ - rust/cloudabi has some...
+ + recordreplay has some but they are AF_UNIX
+
+SOCKET_
+ + Again, lots due to moved WebRTC code
+ + Some android sockets in "LeanPlum" android lib
++ leanplum is disabled
+ + Curl is in the tree now? lol
+ + Some sandboxing co
[tor-commits] [tor-browser-spec/master] Typo, grammar, spell check. Also some XXX notes.
commit 1fd0569a1c2737adf9d01340ee7a5cabc29b3969 Author: Mike Perry Date: Wed Jan 31 02:26:32 2018 + Typo, grammar, spell check. Also some XXX notes. --- design-doc/design.xml | 58 --- 1 file changed, 37 insertions(+), 21 deletions(-) diff --git a/design-doc/design.xml b/design-doc/design.xml index cdab986..43c4cb9 100644 --- a/design-doc/design.xml +++ b/design-doc/design.xml @@ -738,7 +738,7 @@ Also, JavaScript can be used to query the user's timezone via the url="https://www.khronos.org/registry/webgl/specs/1.0/#5.13";>WebGL can reveal information about the video card in use, and high precision timing information can be used to https://cseweb.ucsd.edu/~hovav/dist/jspriv.pdf";>fingerprint the cpu and +url="https://cseweb.ucsd.edu/~hovav/dist/jspriv.pdf";>fingerprint the CPU and interpreter speed. JavaScript features such as https://www.w3.org/TR/resource-timing/";>Resource Timing may leak an unknown amount of network timing related information. And, moreover, @@ -1086,7 +1086,7 @@ a helper application. Furthermore, we ship a https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-browser-52.5.2esr-7.0-2&id=d75b79f6fa920e6a1e3043005dfd50060ea70e57";>patch for Linux users that makes sure sftp:// and smb:// URLs are not passed along to the operating system as this -can lead to proxy bypasses on systems that have GIO/GnomeVS support. And proxy +can lead to proxy bypasses on systems that have GIO/GnomeVFS support. And proxy bypass risks due to file:// URLs should be mitigated for macOS and Linux users by https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-browser-52.5.2esr-7.0-2&id=8db44df10d1d82850e8b4cfe81ac3b5fce32a663";> two https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-browser-52.5.2esr-7.0-2&id=a8e1fcc8678aa1583f73ef231c99f77cf17196d9";> @@ -1095,7 +1095,7 @@ further patches. -Additionally, modern desktops now pre-emptively fetch any URLs in Drag and +Additionally, modern desktops now preemptively fetch any URLs in Drag and Drop events as soon as the drag is initiated. This download happens independent of the browser's Tor settings, and can be triggered by something as simple as holding the mouse button down for slightly too long while @@ -1264,7 +1264,7 @@ and no other browser vendor or standards body had invested the effort to enumerate or otherwise deal with these vectors for third party tracking. As such, we have had to enumerate and isolate these identifier sources on a piecemeal basis. This has gotten better lately with Mozilla stepping up and -helping us with uplifting our patches, and with contributing own ones where we +helping us with uplifting our patches, and with contributing their own patches where we lacked proper fixes. However, we are not done yet with our unlinkability defense as new identifier sources are still getting added to the web platform. Here is the list that we have discovered and dealt with to date: @@ -1303,10 +1303,11 @@ We isolate the content and image cache to the URL bar domain by setting Furthermore there is the Cache API (CacheStorage). That one is currently not available in Tor Browser as we do not allow third party cookies and are in -Private Browsing Mode by default. +Private Browsing Mode by default. -Finally, we have the asm.js cache. The cache entry of the sript is (among +Finally, we have the asm.js cache. The cache entry of the script is (among others things, like type of CPU, build ID, source characters of the asm.js module etc.) keyed https://blog.mozilla.org/luke/2014/01/14/asm-js-aot-compilation-and-startup-performance/";>to the origin of the script. Lacking a good solution for binding it to the URL bar domain instead we decided @@ -1581,7 +1582,7 @@ We provide the isolation in Tor Browser by setting OCSP -OCSP requests go to Certfication Authorities (CAs) to check for revoked +OCSP requests go to Certificate Authorities (CAs) to check for revoked certificates. They are sent once the browser is visiting a website via HTTPS and no cached results are available. Thus, to avoid information leaks, e.g. to exit relays, OCSP requests MUST go over the same circuit as the HTTPS request causing @@ -1600,7 +1601,7 @@ the browser itself (similar to the OCSP mechanism mentioned in the previous section). Those requests MUST be isolated to the URL bar domain. - Implemetation Status: + Implementation Status: Favicon requests are isolated to the URL bar domain by setting privacy.firstparty.isolate to true. @@ -1665,7 +1666,7 @@ We allow these requests to proceed, but we isolate them. The Permissions API allows a website to query the status of different permissions. Although permissions are keyed to the origin, that is not enough to -alleviate cross-linkabilility concerns: the combined permission state could work +alleviate cross-linkability concerns: the combined
[tor-commits] [tor-browser-spec/master] Add FF52 network audit notes.
commit dd20750a191dd042b6e5744e723968e15b72ecaa
Author: Mike Perry
Date: Tue Apr 4 15:38:22 2017 -0400
Add FF52 network audit notes.
---
audits/FF52_NETWORK_AUDIT | 184 ++
1 file changed, 184 insertions(+)
diff --git a/audits/FF52_NETWORK_AUDIT b/audits/FF52_NETWORK_AUDIT
new file mode 100644
index 000..a249f50
--- /dev/null
+++ b/audits/FF52_NETWORK_AUDIT
@@ -0,0 +1,184 @@
+Lowest level resolver calls:
+ + PR_GetHostByName
+ + security/nss/cmd/libpkix/pkix_pl/pki/test_socket.c (just tests)
+ + security/nss/cmd/vfyserv/vfyserv.c (test)
+ - security/nss/lib/certhigh/ocsp.c
+ + ./netwerk/protocol/rtsp/rtsp/RTSPConnectionHandler.h
+ - MOZ_RTSP -> Only on android. XXX: Verify disabled
+ + ./netwerk/protocol/rtsp/rtsp/ARTSPConnection.cpp
+ - MOZ_RTSP -> Only on android. XXX: Verify disabled
+ + ./security/nss/lib/certhigh/ocsp.c:
+ - Patched (XXX: Verify application)
+ + ./security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c
+ + pkix_pl_Socket_CreateByName()
+ - Patched (XXX: Verify application)
+ + pkix_pl_Socket_CreateByHostAndPort()
+ - Patched (XXX: Verify application)
+ - ./toolkit/profile/nsProfileLock.cpp
+ - nsProfileLock::LockWithSymlink() looks up 127.0.0.1..
+ - XXX: verify patch
+ - Verify DNS patch (esp with e10s)
+ + PR_GetAddrInfoByName
+ + PR_GetIPNodeByName
+
+UDPSockets
++ security/nss/cmd/certutil/certext.c
+
+FlyWeb: XXX: Disable?? Might be off already. Seems incomplete.
+ - dom/flyweb/FlyWebService.cpp
+ - https://wiki.mozilla.org/FlyWeb
+
+MDNS: (./netwerk/dns/mdns/libmdns/) verify againXXX
+ - @mozilla.org/toolkit/components/mdnsresponder/dns-sd;1
+ - DNSSERVICEDISCOVERY_CONTRACT_ID
+ - ./dom/presentation/provider/MulticastDNSDeviceProvider.cpp
+ - XXX-old: Presentation API?
+ https://developer.mozilla.org/en-US/docs/Web/API/Presentation_API
+ - DNSSERVICEINFO_CONTRACT_ID
+ - ./dom/presentation/provider/MulticastDNSDeviceProvider.cpp
+ - @mozilla.org/toolkit/components/mdnsresponder/dns-info;1
+
+Direct paths to DNS resolution:
+ + nsHostResolver::ResolveHost
+ + Only used by nsDNSService
+ + nsDNSService::Resolve
+ - Patched for safety (XXX: Verify application)
+ + nsDNSService::AsyncResolve
+ - Patched for safety (XXX: Verify application)
+ - ChildDNSService::AsyncResolve and ChildDNSService::Resolve
+ - Possibly only active if MOZILLA_XPCOMRT_API is defined.. But it seems to
+ be.
+ - ./netwerk/dns/ChildDNSService.cpp
+ - XXX: Should patch AsyncResolve and Resolve here, as we do in
+ nsDNSService.
+ - XXX: New parent/child interfaces DNSRequestParent and DNSRequestChild
+ + ./netwerk/ipc/NeckoParent.cpp
+ + Calls into DNS service via DNSRequestParent::DoAsyncResolve()
+ + ./netwerk/ipc/NeckoChild.cpp
+
+XXX Strange things doing DNS:
+ - mtransport (media/mtransport/test/ice_unittest.cpp)
+ - XXX Bleh rolls its own Resolve() using getaddirinfo (not PR_GetAddrInfo)
+ - Pretty sure is disabled.
+ - XXX: StreamingListener::SocketWriter::MakeConnection goes getaddrinfo()
+ - Pretty sure this is just a unit test though.
+ + third_party/rust/libc/src/unix/mod.rs (exports but doens't use getaddrinfo)
+
+SOCK_:
+ - netwerk/base/NetworkInfoServiceCocoa.cpp (SOCK_DGRAM)
+ - netwerk/base/NetworkInfoServiceLinux.cpp
+ - Internal code, possibly for ICE?
+ - nsNetworkInfoService::ListNetworkAddresses
+ - XXX: Used by mDNS and the presentation API (dom/presentation/*)
+ + netwerk/sctp/datachannel/DataChannel.cpp
+ + Disabled via WebRTC
+ - StreamingListener::SocketWriter::MakeConnection
+ - Pretty sure this is just a unit test though.
+
+SOCKET_:
+ + devtools/shared/webconsole/network-monitor.js
+ + Just an observer
+ - dom/network/TCPSocketParent.cpp
+ - Probably OK. Disable via DOM prefs
+ - dom/network/UDPSocketParent.cpp
+ - Probably OK. Disable via DOM prefs
+ - media/mtransport/nr_socket_prsock.cpp
+ - NrUdpSocketIpc::connect_i
+ - NrSocket::connect(nr_transport_addr *addr) {
+ - NrSocket(), NrSocketBase, CreateSocket()
+ - Probably disabled with webrtc? XXX: Check.
+ + nsSocketTransportService
+ + None of the new stuff actually makes new sockets
+ + nsUDPSocket
+ - third_party/rust/url/src/host.rs
+ - XXX: Hrmm.. Fuck to_socket_addrs
+
+UDPSocket:
+ - dom/network/UDPSocket*
+ - Same deal. Disable.
+ + media/mtransport/nr_socket_prsock.cpp
+ + Webrtc again.
+ - netwerk/dns/mdns/libmdns/fallback/MulticastDNS.jsm (XXX: Yikes)
+ - XXX: Ensure mdns is disabled
+
+TCPSocket:
+ - dom/base/Navigator.cpp (hook for MozTcpSocket)
+ - disable
+ - dom/media/bridge/MediaModule.cpp
+ - PeerConnection stuff.
+ - media/mtransport/*
+ - Disable
+ - netwerk/ipc/PNecko.ipdl (hrmm... check full source?)
+
+Rust:
+ + media/libstagefright/binding
+ + netwerk/base/rust-url-capi
+
+-socket: (XPCOM)
+ - dom/flyweb/HttpServer.cpp
+ - Ensure flyweb is disabled
+ - dom/presentation/provider/PresentationCon
[tor-commits] [tor-browser/tor-browser-45.2.0esr-6.5-1] fixup! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
commit 59a087921cc38432f6829c3bccf3ba23fe184c63
Author: difw
Date: Thu Jul 28 12:15:05 2016 -0700
fixup! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove
Amazon, eBay, bing
Switch Default to DuckDuckGo HTTPS. Add .onion.
---
browser/app/profile/000-tor-browser.js| 4 ++--
browser/locales/en-US/searchplugins/ddg-onion.xml | 11 +++
browser/locales/en-US/searchplugins/ddg.xml | 4 ++--
browser/locales/en-US/searchplugins/list.txt | 1 +
4 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/browser/app/profile/000-tor-browser.js
b/browser/app/profile/000-tor-browser.js
index c60b341..a5c0e7f 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -268,7 +268,7 @@ pref("browser.uiCustomization.state",
"{\"placements\":{\"PanelUI-contents\":[\"
// Putting the search engine prefs into this file to fix #11236.
// Default search engine
-pref("browser.search.defaultenginename", "Disconnect");
+pref("browser.search.defaultenginename", "DuckDuckGo");
// Make sure we use the same search engine regardless of locale
pref("browser.search.geoSpecificDefaults", false);
@@ -276,7 +276,7 @@ pref("browser.search.geoSpecificDefaults", false);
// Somewhat surprisingly we get some random behavior if we specify more than
// two search engines as below. See
// https://bugzilla.mozilla.org/show_bug.cgi?id=1126722 for details.
-pref("browser.search.order.extra.1", "Disconnect");
+pref("browser.search.order.extra.1", "DuckDuckGo");
pref("browser.search.order.extra.2", "YouTube");
// Hacks/workarounds: Direct2D seems to crash w/ lots of video cards w/ MinGW?
diff --git a/browser/locales/en-US/searchplugins/ddg-onion.xml
b/browser/locales/en-US/searchplugins/ddg-onion.xml
new file mode 100644
index 000..009da7e
--- /dev/null
+++ b/browser/locales/en-US/searchplugins/ddg-onion.xml
@@ -0,0 +1,11 @@
+http://www.mozilla.org/2006/browser/search/";>
+DuckDuckGoOnion
+Duck Duck Go Onion
+UTF-8
+data:image/x-icon;base64,iVBORw0KGgoNSUhEUgAAABAQCAMoLQ9TBGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAB8lBMVEUAAADkRQzjPwPjQQXkRQ3iPwTiQQXgPQPeQgrcOwPVNgDVNQDWOgbTMwDRMgDQMwDSMwDRNwTQLgDRJgDSJwDSLgDSNwTjOgDiOADjOQDkPADhQAXzs5v+/fv0vKbiRQvgPQHpdUr85NzuknPdKgDcIwDnZzj2w7HqeU/gPQLsimb/+PftjWn97Obpb0LdJQDeLQDtjmvsi2jgSBDnbULgOQD/39HgLQDeMgDpeFLgSBH0v670uqbaJQD2qImWvP/G1Ob5+/3u//+fvvXyp47dMwDaLwD0u6v0v6/aNQDiXi/aKQD3qozU7/8gSY2vvtg0ZK/OqLDaKQHYKgLgWTfaNADZMgDZMADZLADzqpD7//+xwdz//9H/5Bn/7Bn//ADofADYMADYMQDZOgPXLgDiZDj//97/0AD3tQDvlgHZOgbXLATXMADWMgDfXjLVLQD///z+0AD/3Rn/yRnwnQDcVjbVMQDyv67wuKTSJwDRHQD+8O/tg3/iQQDwhAHnawHWMADvtKfyva7XQxHga0bQGQD2vbH/u8LXIQCmPQzja07XQxLliGn99fPkcVHvhnGZ5VguvUU5wktBwCcAgxzydVv/8/XmiGngdlL+ysi3+I8LtCE80V6P3YmX4sDleljSNQLzr6D7sKPXNQTSIwAEAbMrF3RSTlMARqSkRvPz80PTpKRG3fPe3hio9/eoGP50jNsBYktHRB5yCiAryElEQVQYGQXBvUqCYRiA4fu2V9Tn+UQddI3aCpxaOoU6iU4gcqqpoYbALXBuCuoYmttamq
JDiEoh4YP+MOi6BNCh+uYKEGiOVNCXXxA2XDVV/UyfKbRCXTLQWAxbP2vt8Ue/uYDvfim91615sb2um6rqtrr/NFb1cUf1Ybd06areU6lSlYpK79jzK1SyJOkfhOl8JGEcqV5zoKrTRqO6yUzIzNu46ijdM1VV9bhuUJ/nZURExLRzUiPQm3kKXHi4BAEGOmOi78A/L1QoU/VHoTsldEVYdGRhdGU6Y3JlYXRlADIwMTQtMDEtMTlUMjA6MDE6MTEtMDU6MDAuET6cJXRFWHRkYXRlOm1vZGlmeQAyMDE0LTAxLTE5VDIwOjAxOjExLTA1OjAwX0yGIABJRU5ErkJggg==
+http://3g2upl4pq6kufc4m.onion/html/";>
+
+
+http://3g2upl4pq6kufc4m.onion/html/
+
+
diff --git a/browser/locales/en-US/searchplugins/ddg.xml
b/browser/locales/en-US/searchplugins/ddg.xml
index d82cdbd..aceb0ac 100644
--- a/browser/locales/en-US/searchplugins/ddg.xml
+++ b/browser/locales/en-US/searchplugins/ddg.xml
@@ -22,9 +22,9 @@
AScg7HAnIOz2JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7HAnIOwB
JyDsJicg7IAnIOyzJyDs5icg7OYnIOyzJyDsgCcg7CYA
+B8AAPAPAADAAwAAwAMAAIABAQABAACAAQAAwAMAAMAD
AADwDwAA+B8AAA==
-http://3g2upl4pq6kufc4m.onion/html/";>
+https://duckduckgo.com/";>
-http://3g2upl4pq6kufc4m.onion/html/
+https://duckduckgo.com/
diff --git a/browser/locales/en-US/searchplugins/list.txt
b/browser/locales/en-US/searchplugins/list.txt
index 71b6c0f..0b4f1fb 100644
--- a/browser/locales/en-US/searchplugins/list.txt
+++ b/browser/locales/en-US/searchplugins/list.txt
@@ -2,6 +2,7 @@ disconnect
youtube
twitter
wikipedia
+ddg-onion
startpage
yahoo
google
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-45.2.0esr-6.5-1] fixup! Regression tests for "Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing"
commit 146ae4cc141f702785f896ff8c90bdfa0ab90b60
Author: difw
Date: Fri Jul 29 09:32:22 2016 -0700
fixup! Regression tests for "Omnibox: Add DDG, Startpage, Disconnect,
Youtube, Twitter; remove Amazon, eBay, bing"
Update tests.
---
tbb-tests/browser_tor_omnibox.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tbb-tests/browser_tor_omnibox.js b/tbb-tests/browser_tor_omnibox.js
index 8648551..082dd84 100644
--- a/tbb-tests/browser_tor_omnibox.js
+++ b/tbb-tests/browser_tor_omnibox.js
@@ -8,7 +8,7 @@ function test() {
engineIDs = browserSearchService.getEngines().map(e => e.identifier);
// Check that we have the correct engines installed, in the right order.
- is(engineIDs[0], "disconnect", "Default search engine is disconnect");
+ is(engineIDs[0], "ddg", "Default search engine is disconnect");
is(engineIDs[1], "youtube", "Secondary search engine is youtube");
is(engineIDs[2], "google", "Google is third search engine");
}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [torbutton/master] Release preparations for 1.9.6.1
commit e403cd883db74649eed86aed0edaf3d101d07fbb Author: Mike Perry Date: Thu Jul 28 17:03:03 2016 -0700 Release preparations for 1.9.6.1 CHANGELOG update, version bump --- src/CHANGELOG | 7 +++ src/install.rdf | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index e62bafd..cd5ce27 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,10 @@ +1.9.6.1 + * Bug 19206: Avoid SOCKS auth and NEWNYM collisions when sharing a tor client + * Bug 19417: Disable asm.js (but add code to clear on New Identity if enabled) + * Bug 19689: Plugin usage prompt is parented to wrong window + * Bug 19273: Improve external app launch handling and associated warnings + * Bug 8725: Block addon resource and url fingerprinting with nsIContentPolicy + 1.9.6 * Bug 18743: Pref to hide 'Sign in to Sync' button in hamburger menu * Bug 18905: Hide unusable items from help menu diff --git a/src/install.rdf b/src/install.rdf index db269d5..e33fdb9 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ Torbutton Mike Perry torbut...@torproject.org -1.9.6 +1.9.6.1 https://www.torproject.org/projects/torbrowser.html.en chrome://torbutton/content/preferences.xul chrome://torbutton/skin/tor.png ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [torbutton/master] Bug 8725: Consistently deny redirects to browser/addon internal URLs.
commit fa67687df5fc72c0b6085d9941331277d32319f3
Author: Yawning Angel
Date: Sat Jul 16 03:37:27 2016 +
Bug 8725: Consistently deny redirects to browser/addon internal URLs.
The browser's behavior is different depending on if a given internal
resource is available or not, regardless of the fact that the actual
body will not load due to the various safeguards and checks.
This normalizes the behavior by denying all redirects destined for URLs
with proscribed browser internal schemes (`resource`, `about`, `chrome`).
---
src/components/content-policy.js | 41 +---
1 file changed, 38 insertions(+), 3 deletions(-)
diff --git a/src/components/content-policy.js b/src/components/content-policy.js
index c6c8aa9..e025ecd 100644
--- a/src/components/content-policy.js
+++ b/src/components/content-policy.js
@@ -8,7 +8,7 @@
*
https://notabug.org/desktopd/no-resource-uri-leak/src/master/src/resource-filter/content-policy.js
*/
-const Ci = Components.interfaces, Cu = Components.utils;
+const Cc = Components.classes, Ci = Components.interfaces, Cu =
Components.utils;
// Import XPCOMUtils object.
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
@@ -21,8 +21,6 @@ ContentPolicy.prototype = {
contractID: "@torproject.org/content-policy;1",
QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentPolicy]),
- _xpcom_categories: [{category: "content-policy"}],
-
shouldLoad: function(aContentType, aContentLocation, aRequestOrigin,
aContext, aMimeTypeGuess, aExtra) {
// Accept if no content URI or scheme is not a resource/chrome.
if (!aContentLocation || !(aContentLocation.schemeIs('resource') ||
aContentLocation.schemeIs('chrome')))
@@ -44,5 +42,42 @@ ContentPolicy.prototype = {
},
};
+// Install a HTTP response handler to check for redirects to URLs with schemes
+// that should be internal to the browser. There's various safeguards and
+// checks that cause the body to be unavailable, but the `onLoad()` behavior
+// is inconsistent, which results in leaking information about the specific
+// user agent instance (eg: what addons are installed).
+var requestObserver = {
+ ioService:
Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService),
+ observerService:
Cc["@mozilla.org/observer-service;1"].getService(Ci.nsIObserverService),
+
+ start: function() {
+this.observerService.addObserver(this, "http-on-examine-response", false);
+ },
+
+ observe: function(aSubject, aTopic, aData) {
+let aChannel = aSubject.QueryInterface(Ci.nsIHttpChannel);
+let aStatus = aChannel.responseStatus;
+
+// If this is a redirect...
+//
+// Note: Technically `304 Not Modifed` isn't a redirect, but receiving that
+// to the proscribed schemes is nonsensical.
+if (aStatus >= 300 && aStatus < 400) {
+ let location = aChannel.getResponseHeader("Location");
+ let aUri = this.ioService.newURI(location, null, null);
+
+ // And it's redirecting into the browser or addon's internal URLs...
+ if (aUri.schemeIs("resource") || aUri.schemeIs("chrome") ||
aUri.schemeIs("about")) {
+// Cancel the request.
+aSubject.cancel(Components.results.NS_BINDING_ABORTED);
+ }
+}
+ },
+};
+
// Firefox >= 4.0 (Old versions are extremely irrelevant).
var NSGetFactory = XPCOMUtils.generateNSGetFactory([ContentPolicy]);
+
+// Register the request observer to handle redirects.
+requestObserver.start();
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [torbutton/master] Merge remote-tracking branch 'yawning/bug8725_take3'
commit 3b8e1a3508c7cb15d15c93149acab81ea8c51d9a Merge: 7dd7101 fa67687 Author: Mike Perry Date: Thu Jul 28 15:06:21 2016 -0700 Merge remote-tracking branch 'yawning/bug8725_take3' src/chrome.manifest | 4 ++ src/components/content-policy.js | 83 2 files changed, 87 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [torbutton/master] Bug 8725: Block `resource://` based fingerprinting with nsIContentPolicy.
commit 3bff5aaea6e1a732ff908527f67d1784ecf23c57
Author: Yawning Angel
Date: Fri Jun 17 01:25:09 2016 +
Bug 8725: Block `resource://` based fingerprinting with nsIContentPolicy.
Based on ResourceFilter: A direct workaround for https://bugzil.la/863246
https://notabug.org/desktopd/no-resource-uri-leak/src/master/src/resource-filter/content-policy.js
---
src/chrome.manifest | 4
src/components/content-policy.js | 48
2 files changed, 52 insertions(+)
diff --git a/src/chrome.manifest b/src/chrome.manifest
index e85a205..340ed27 100644
--- a/src/chrome.manifest
+++ b/src/chrome.manifest
@@ -170,6 +170,10 @@ category profile-after-change CookieJarSelector
@torproject.org/cookie-jar-selec
component {65be2be0-ceb4-44c2-91a5-9c75c53430bf} components/torRefSpoofer.js
contract @torproject.org/torRefSpoofer;1 {65be2be0-ceb4-44c2-91a5-9c75c53430bf}
+component {4c03be7d-492f-990e-f0da-f3689e564898} components/content-policy.js
+contract @torproject.org/content-policy;1
{4c03be7d-492f-990e-f0da-f3689e564898}
+category content-policy ContentPolicy @torproject.org/content-policy;1
+
category profile-after-change RefSpoofer @torproject.org/torRefSpoofer;1
category profile-after-change StartupObserver
@torproject.org/startup-observer;1
category profile-after-change DomainIsolator @torproject.org/domain-isolator;1
diff --git a/src/components/content-policy.js b/src/components/content-policy.js
new file mode 100644
index 000..b4b33a7
--- /dev/null
+++ b/src/components/content-policy.js
@@ -0,0 +1,48 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*-
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/*
+ * Based on ResourceFilter: A direct workaround for https://bugzil.la/863246
+ *
https://notabug.org/desktopd/no-resource-uri-leak/src/master/src/resource-filter/content-policy.js
+ */
+
+const Ci = Components.interfaces, Cu = Components.utils;
+
+// Import XPCOMUtils object.
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+
+function ContentPolicy() {}
+
+ContentPolicy.prototype = {
+ classDescription: "ContentPolicy",
+ classID: Components.ID("{4c03be7d-492f-990e-f0da-f3689e564898}"),
+ contractID: "@torproject.org/content-policy;1",
+ QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentPolicy]),
+
+ _xpcom_categories: [{category: "content-policy"}],
+
+ shouldLoad: function(aContentType, aContentLocation, aRequestOrigin,
aContext, aMimeTypeGuess, aExtra) {
+// Accept if no content URI or scheme is not a resource.
+if (!aContentLocation || !aContentLocation.schemeIs('resource'))
+ return Ci.nsIContentPolicy.ACCEPT;
+
+// Accept if no origin URI, or if the origin URI scheme is chrome/resource.
+if (!aRequestOrigin || aRequestOrigin.schemeIs('resource') ||
aRequestOrigin.schemeIs('chrome'))
+ return Ci.nsIContentPolicy.ACCEPT;
+
+// Accept if resource directly loaded into a tab.
+if (Ci.nsIContentPolicy.TYPE_DOCUMENT === aContentType)
+ return Ci.nsIContentPolicy.ACCEPT;
+
+return Ci.nsIContentPolicy.REJECT_REQUEST;
+ },
+
+ shouldProcess: function(aContentType, aContentLocation, aRequestOrigin,
aContext, aMimeType, aExtra) {
+return Ci.nsIContentPolicy.ACCEPT;
+ },
+};
+
+// Firefox >= 4.0 (Old versions are extremely irrelevant).
+var NSGetFactory = XPCOMUtils.generateNSGetFactory([ContentPolicy]);
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [torbutton/master] Bug 8725: Block `chrome://` based fingerprinting with nsIContentPolicy.
commit ace11cd8020aaf0136ee58aa074666f10c14abb9
Author: Yawning Angel
Date: Fri Jun 17 01:27:14 2016 +
Bug 8725: Block `chrome://` based fingerprinting with nsIContentPolicy.
Most addons do not set `contentaccessible=yes`, however behavior should
be consistent even if such addons are installed.
This does not affect any of the standard addons shipped with Tor Browser,
but
will break user installed addons that depend on actually being able to
access `chrome://` URLs in this manner.
---
src/components/content-policy.js | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/components/content-policy.js b/src/components/content-policy.js
index b4b33a7..c6c8aa9 100644
--- a/src/components/content-policy.js
+++ b/src/components/content-policy.js
@@ -24,12 +24,12 @@ ContentPolicy.prototype = {
_xpcom_categories: [{category: "content-policy"}],
shouldLoad: function(aContentType, aContentLocation, aRequestOrigin,
aContext, aMimeTypeGuess, aExtra) {
-// Accept if no content URI or scheme is not a resource.
-if (!aContentLocation || !aContentLocation.schemeIs('resource'))
+// Accept if no content URI or scheme is not a resource/chrome.
+if (!aContentLocation || !(aContentLocation.schemeIs('resource') ||
aContentLocation.schemeIs('chrome')))
return Ci.nsIContentPolicy.ACCEPT;
-// Accept if no origin URI, or if the origin URI scheme is chrome/resource.
-if (!aRequestOrigin || aRequestOrigin.schemeIs('resource') ||
aRequestOrigin.schemeIs('chrome'))
+// Accept if no origin URI or if origin scheme is chrome/resource/about.
+if (!aRequestOrigin || aRequestOrigin.schemeIs('resource') ||
aRequestOrigin.schemeIs('chrome') || aRequestOrigin.schemeIs('about'))
return Ci.nsIContentPolicy.ACCEPT;
// Accept if resource directly loaded into a tab.
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-spec/master] FF45 network audit notes w/ finished XPCOM review.
commit 4e1a7e2cb23a9f6b7f33bf460f48571e771e951b Author: Mike Perry Date: Thu Apr 21 18:46:04 2016 -0700 FF45 network audit notes w/ finished XPCOM review. --- audits/FF45_NETWORK_AUDIT | 94 +-- 1 file changed, 51 insertions(+), 43 deletions(-) diff --git a/audits/FF45_NETWORK_AUDIT b/audits/FF45_NETWORK_AUDIT index a11efc9..7f3169a 100644 --- a/audits/FF45_NETWORK_AUDIT +++ b/audits/FF45_NETWORK_AUDIT @@ -314,30 +314,35 @@ Misc XPCOM: + ./layout/build/nsLayoutModule.cpp - @mozilla.org/network/*socket* (grep -R "@mozilla.org/network/" . | grep socket | grep -v udp-socket) - - ./dom/presentation/provider/TCPPresentationServer.js - - XXX: Server-side listening socket? MDN docs indicate the Presentation + + ./dom/network/TCPSocket.cpp + + Already checked + + ./netwerk/build/nsNetCID.h + + ./dom/presentation/provider/TCPPresentationServer.js + + XXX: Server-side listening socket? MDN docs indicate the Presentation stuff is not live yet - - ./dom/ipc/preload.js - - ./netwerk/protocol/websocket/WebSocketChannel.cpp - - ./devtools/shared/security/socket.js - - ./mobile/android/chrome/content/WebappRT.js - - ./browser/extensions/loop/chrome/content/modules/MozLoopPushHandler.jsm - - ./toolkit/modules/Sntp.jsm - - ./toolkit/modules/secondscreen/RokuApp.jsm - - ./toolkit/xre/nsAppRunner.cpp - - + ./addon-sdk/source/lib/sdk/io/stream.js - + Addon APIs + + https://developer.mozilla.org/en-US/docs/Web/API/Presentation + + dom.presentation.enabled is currently false + - ./dom/network/TCPServerSocket.cpp + - ServerSocket: + - Presentation server (disabled) + - Android stuff: XXX: + - ./dom/media/android/AndroidMediaResourceServer.cpp + - ./build/mobile/sutagent/android/ + - ./gfx/layers/LayerScope.cpp + - is this e10s multiprocess stuff? + + ./dom/push/PushServiceWebSocket.jsm + ./dom/ipc/preload.js - + ./dom/network/TCPServerSocket.js - - ./mobile/android/chrome/content/WebappRT.js - - Debugger? - - XXX: Pretty sure this is only for 'webapps', but it sets some scary -prefs that might impact other browser operation if an app is -installed? - + ./netwerk/build/nsNetCID.h + + ./netwerk/protocol/websocket/WebSocketChannel.cpp + + ./netwerk/protocol/websocket/WebSocketChannelParent.cpp + + ./services/sync/tps/extensions/mozmill/resource/stdlib/httpd.js + + ./browser/extensions/loop/chrome/content/modules/MozLoopPushHandler.jsm + + ./toolkit/modules/Sntp.jsm + + FxOS only + + ./toolkit/modules/secondscreen/RokuApp.jsm + + Disabled already + + ./toolkit/xre/nsAppRunner.cpp - Debugger stuff - - XXX: Has several prefs: + - XXX: Has several prefs: Verify we set these - devtools.webide.enabled - devtools.debugger.enabled? - devtools.debugger.remote-enabled @@ -347,12 +352,16 @@ Misc XPCOM: - ./toolkit/devtools/client/connection-manager.js - ./toolkit/devtools/client/dbg-client.jsm - ./toolkit/devtools/security/socket.js - - ./toolkit/modules/Sntp.jsm - - B2G ntp - - ./toolkit/xre/nsAppRunner.cpp + - ./devtools/shared/security/auth.js + - ./mobile/android/chrome/content/WebappRT.js + - Debugger? + - XXX: Pretty sure this is only for 'webapps', but it sets some scary +prefs that might impact other browser operation if an app is +installed? + createTransport() - - ./netwerk/base/Dashboard.cpp - -XXX: What the hell is this? + + ./netwerk/base/Dashboard.cpp + + The only problematic function seems to be requestConnection, used + only by tests. + Found earlier: + ./toolkit/devtools/security/socket.js: + ./toolkit/modules/Sntp.jsm: @@ -363,32 +372,31 @@ Misc XPCOM: - Misc XPCOM Contract-ID/CID defines: - NS_*SOCKET*_C should get them all (grep -R "NS_" | grep SOCKET | grep "_C") -+ WebRTC and mtransport (disabled) ++ WebRTC and mtransport (disabled)a ++ dom/bluetooth/bluedroid/BluetoothDaemonInterface.cpp (B2G) ++ dom/presentation/PresentationSessionTransport.cpp + + pref dom.presentation.* ++ dom/media/bridge/MediaModule.cpp + + Compiled out by webrtc ++ netwerk/base/nsIOService.cpp ++ netwerk/standalone/nsNetModuleStandalone.cpp ++ netwerk/sctp/datachannel/DataChannel.cpp + + Disabled with Webrtc ++ security/manager/ssl/SSLServerCertVerification.cpp ++ security/manager/ssl/SharedSSLState.cpp: ++ Webrtc stuff (disabled) ++ mtransport stuff (disabled) - gfx/layers/LayerScope.cpp - - XXX - -+ NS_SOCKETTRANSPORTSERVICE_* - + Proxied if TCP - + Udp limited to mtransport and webrtc -+ NS_UDPSOCKET_* - + - XXX: e10s? + netwerk/protocol/websocket/WebSocketChannel.cpp: + netwerk/protocol/http/nsHttpHandler.cpp: + netwerk/protocol/http/nsHttpConnectionMgr.c
[tor-commits] [tor-browser-spec/master] FF45 review Woops. missed a note in the edit buffer.
commit 83524206efec79238be0f11e1b2566cb89595c3e Author: Mike Perry Date: Fri Apr 8 15:51:48 2016 -0700 FF45 review Woops. missed a note in the edit buffer. --- audits/FF45_NETWORK_AUDIT | 2 ++ 1 file changed, 2 insertions(+) diff --git a/audits/FF45_NETWORK_AUDIT b/audits/FF45_NETWORK_AUDIT index 2d749a8..a11efc9 100644 --- a/audits/FF45_NETWORK_AUDIT +++ b/audits/FF45_NETWORK_AUDIT @@ -315,6 +315,8 @@ Misc XPCOM: - @mozilla.org/network/*socket* (grep -R "@mozilla.org/network/" . | grep socket | grep -v udp-socket) - ./dom/presentation/provider/TCPPresentationServer.js + - XXX: Server-side listening socket? MDN docs indicate the Presentation + stuff is not live yet - ./dom/ipc/preload.js - ./netwerk/protocol/websocket/WebSocketChannel.cpp - ./devtools/shared/security/socket.js ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-spec/master] Commit partial progress FF45 audit doc.
commit f66c31f82b04376a31cd564b250a1ee6bb2cac0b Author: Mike Perry Date: Mon Mar 21 10:49:26 2016 -0700 Commit partial progress FF45 audit doc. Still XPCOM remains, but that is relatively lower risk. --- audits/FF45_NETWORK_AUDIT | 412 ++ 1 file changed, 412 insertions(+) diff --git a/audits/FF45_NETWORK_AUDIT b/audits/FF45_NETWORK_AUDIT new file mode 100644 index 000..2d749a8 --- /dev/null +++ b/audits/FF45_NETWORK_AUDIT @@ -0,0 +1,412 @@ +Lowest level resolver calls: + + PR_GetHostByName + + ./netwerk/protocol/rtsp/rtsp/RTSPConnectionHandler.h + - MOZ_RTSP -> Only on android. XXX: Verify disabled + + ./netwerk/protocol/rtsp/rtsp/ARTSPConnection.cpp + - MOZ_RTSP -> Only on android. XXX: Verify disabled + + ./security/nss/lib/certhigh/ocsp.c: + - Patched (XXX: Verify application) + + ./security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c + + pkix_pl_Socket_CreateByName() + - Patched (XXX: Verify application) + + pkix_pl_Socket_CreateByHostAndPort() + - Patched (XXX: Verify application) + + ./security/nss/cmd/ + + NSS cli commands only + + ./nsprpub/pr/src/misc/prnetdb.c + + Fallback for PR_GetAddrInfoByName + + ./nsprpub/pr/src/cplus/rcnetdb.cpp + + RCHostLookup::ByName() + + Still Not used + - ./toolkit/profile/nsProfileLock.cpp + - nsProfileLock::LockWithSymlink() looks up 127.0.0.1.. + - XXX: We should patch this. + + PR_GetIPNodeByName + + Used by tests only + + PR_StringToNetAddr + + Passes AI_NUMERICHOST to getaddrinfo. No resolution. + + + PR_GetAddrInfoByName + + ./security/nss/cmd/ usage (NSS cli commands only) + - ./netwerk/dns/mdns/libmdns/* + - XXX: New. Possibly android only? + + ./netwerk/dns/GetAddrInfo.cpp + + ./netwerk/dns/nsHostResolver.cpp + - nsHostResolver::ResolveHost() is entrypoint + + nsHostResolver::ThreadFunc() will resolve without SOCKS + + Only used by nsDNSService2 + - XXX: Watch out for the new parent/child interfaces.. + +MDNS: (./netwerk/dns/mdns/libmdns/) XXX + - @mozilla.org/toolkit/components/mdnsresponder/dns-sd;1 + - DNSSERVICEDISCOVERY_CONTRACT_ID + - ./dom/presentation/provider/MulticastDNSDeviceProvider.cpp + - XXX: Presentation API? + https://developer.mozilla.org/en-US/docs/Web/API/Presentation_API + - DNSSERVICEINFO_CONTRACT_ID + - ./dom/presentation/provider/MulticastDNSDeviceProvider.cpp + - @mozilla.org/toolkit/components/mdnsresponder/dns-info;1 + +Direct paths to DNS resolution: + + nsHostResolver::ResolveHost + + Only used by nsDNSService + + nsDNSService::Resolve + - Patched for safety (XXX: Verify application) + + nsDNSService::AsyncResolve + - Patched for safety (XXX: Verify application) + - ChildDNSService::AsyncResolve and ChildDNSService::Resolve + - Possibly only active if MOZILLA_XPCOMRT_API is defined.. But it seems to + be. + - ./netwerk/dns/ChildDNSService.cpp + - XXX: Should patch AsyncResolve and Resolve here, as we do in + nsDNSService. + - XXX: New parent/child interfaces DNSRequestParent and DNSRequestChild + + ./netwerk/ipc/NeckoParent.cpp + + Calls into DNS service via DNSRequestParent::DoAsyncResolve() + + ./netwerk/ipc/NeckoChild.cpp + +Misc UDP (SOCK_DGRAM, PR_DESC_SOCKET_UDP): + + PR_DESC_SOCKET_UDP + + ./nsprpub/pr/src/cplus/rcio.h + + RCIO (not used) + + RCFileIO (not used) + + RCNetStreamIO (not used) + + ./nsprpub/pr/src/io/prsocket.c + + PR_GetUDPMethods + + ./nsprpub/pr/src/md/os2/os2io.c + + ./nsprpub/pr/src/misc/prinit.c + + PR_GetInheritedFD + + ./nsprpub/pr/src/pthreads/ptio.c + + Reviewed below + + SOCK_DGRAM + - Android: XXX: Are these patched in Orfox? + - ./other-licenses/android/res_send.c + - ./other-licenses/android/res_init.c + - ./other-licenses/android/getaddrinfo.c + + ./hal/gonk/UeventPoller.cpp + + netlink stuff + + ./ipc/chromium/src/third_party/libevent/evdns.c + + evdns is unused + + ./ipc/chromium/src/third_party/libevent/evutil.c + + interface checking functions. Unused. + + ./media/webrtc/* + + Can be disabled still + + ./media/mtransport/third_party/nICEr/src/stun/addrs.c + + boils down to NrIceCtx::StartGathering + + Used only for PeerConnection, which we disable + + SCTP is only enabled with WEBRTC (see configure.in, netwerk/moz.build, and ./dom/base/moz.build) + + ./netwerk/sctp/src/netinet/sctputil.c + + ./netwerk/sctp/src/netinet/sctp_userspace.c + + ./netwerk/sctp/src/netinet/sctp_pcb.c + + ./netwerk/sctp/src/ifaddrs_android.cpp + + ./netwerk/sctp/src/user_recv_thread.c + + ./netwerk/wifi/nsWifiScannerFreeBSD.cpp + + GeoIP stuff. Is disabled. + + ./nsprpub/pr/src/io/prsocket.c + + PR_NewUDPSocket + + PR_OpenUDPSocket + + PR_Socket + + ./nsprpub/pr/src/pthreads/ptio.c + + PR_NewUDPSocket + + PR_OpenUDPSocket + + ./media/mtransport/nr_soc
[tor-commits] [tor-browser-spec/master] Signing notes
commit 980fe8ee4556ba4b7443ffbc5296258de9e6c297 Author: Mike Perry Date: Mon Mar 14 16:08:29 2016 -0700 Signing notes --- processes/KeyGeneration | 15 +++ processes/ReleaseProcess | 2 ++ 2 files changed, 17 insertions(+) diff --git a/processes/KeyGeneration b/processes/KeyGeneration index 4c62c51..e10baee 100644 --- a/processes/KeyGeneration +++ b/processes/KeyGeneration @@ -63,3 +63,18 @@ Key Creation Incantations and Instructions 6) `certutil -d nssdb -L -r -n marsigner -o marsigner.der` 7) If you want to export more than one certificate repeat step 6 adjusting the certificate nickname and the name of the output file + + +Mac Signing Key +=== + +Based on: +https://stackoverflow.com/questions/9245149/jenkins-on-os-x-xcodebuild-gives-code-sign-error + + +cd Library/Keychains +security create-keychain tbb-signing-alpha.keychain +security default-keychain -s tbb-signing-alpha.keychain +security unlock-keychain +certtool r CertificateSigningRequest.certSigningRequest + diff --git a/processes/ReleaseProcess b/processes/ReleaseProcess index 86172d5..647b5ad 100644 --- a/processes/ReleaseProcess +++ b/processes/ReleaseProcess @@ -91,6 +91,8 @@ # We must use $TORBROWSER_VERSION here because signed result dirs should omit the build number suffix rsync -avP $TORBROWSER_VERSION staticiforme.torproject.org:/srv/dist-master.torproject.org/htdocs/torbrowser/ ssh staticiforme.torproject.org "chmod g+w,o+r -R /srv/dist-master.torproject.org/htdocs/torbrowser/*" + ssh staticiforme.torproject.org "chown -R :torwww /srv/dist-master.torproject.org/htdocs/torbrowser/" + ssh staticiforme.torproject.org "cd /srv/dist-master.torproject.org/htdocs/torbrowser/$TORBROWSER_VERSION ; for i in *.asc; do echo $i ; gpg -q $i || break; done" ssh staticiforme.torproject.org "static-update-component dist.torproject.org" #. Local to staticiforme: cd ~/tbb-builds/tor-browser-bundle/gitian ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/master] Add donation redirect for Jake.
commit 5ce492e5fd8707163774f40cf87501c5d14dd59d Author: Mike Perry Date: Fri Jan 8 10:44:03 2016 -0800 Add donation redirect for Jake. --- .htaccess |1 + 1 file changed, 1 insertion(+) diff --git a/.htaccess b/.htaccess index 582b07c..73a8e95 100644 --- a/.htaccess +++ b/.htaccess @@ -68,6 +68,7 @@ RewriteRule ^donate/donate-blog-benw(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-ellsberg(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-alison(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-snowden(.*) /donate/donate$1 [R=302,L] +RewriteRule ^donate/donate-appelbaum(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-chaos(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-nanni(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-landau(.*) /donate/donate$1 [R=302,L] diff --git a/donate/en/donate-appelbaum.wml b/donate/en/donate-appelbaum.wml new file mode 100644 index 000..e69de29 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/master] Actually, I hope that ES is mentioned just a couple more places than our blog.
commit 193905fab3ea55df61f29cdb350a5d808c93eab8 Author: Mike Perry Date: Wed Dec 30 07:42:02 2015 -0800 Actually, I hope that ES is mentioned just a couple more places than our blog. --- .htaccess |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index 6081367..38ff2d5 100644 --- a/.htaccess +++ b/.htaccess @@ -67,7 +67,7 @@ RewriteRule ^donate/donate-hpbanner(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-benw(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-ellsberg(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-alison(.*) /donate/donate$1 [R=302,L] -RewriteRule ^donate/donate-blog-snowden(.*) /donate/donate$1 [R=302,L] +RewriteRule ^donate/donate-snowden(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-chaos(.*) /donate/donate$1 [R=302,L] #keep prefixes of other entries down here... RewriteRule ^donate/donate-hp(.*) /donate/donate$1 [R=302,L] diff --git a/donate/en/donate-blog-snowden.wml b/donate/en/donate-blog-snowden.wml deleted file mode 100644 index e69de29..000 diff --git a/donate/en/donate-snowden.wml b/donate/en/donate-snowden.wml new file mode 100644 index 000..e69de29 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/master] Add donate link for ES.
commit 89eb452185839c491072d8d3010a5ec40cdad8c8 Author: Mike Perry Date: Wed Dec 30 07:40:54 2015 -0800 Add donate link for ES. --- .htaccess |1 + 1 file changed, 1 insertion(+) diff --git a/.htaccess b/.htaccess index fb59b90..6081367 100644 --- a/.htaccess +++ b/.htaccess @@ -67,6 +67,7 @@ RewriteRule ^donate/donate-hpbanner(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-benw(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-ellsberg(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-alison(.*) /donate/donate$1 [R=302,L] +RewriteRule ^donate/donate-blog-snowden(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-chaos(.*) /donate/donate$1 [R=302,L] #keep prefixes of other entries down here... RewriteRule ^donate/donate-hp(.*) /donate/donate$1 [R=302,L] diff --git a/donate/en/donate-blog-snowden.wml b/donate/en/donate-blog-snowden.wml new file mode 100644 index 000..e69de29 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/master] Do we actually need these empty files?
commit 34df5fc9c92821b77ba8421e7fc375be60b44bea Author: Mike Perry Date: Tue Dec 29 03:34:27 2015 -0800 Do we actually need these empty files? --- 0 files changed diff --git a/donate/en/donate-chaos.wml b/donate/en/donate-chaos.wml new file mode 100644 index 000..e69de29 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/master] CCC Donations link.
commit ff3ad8e4e6096b51c5ec8c38e8c765e07b98f7aa Author: Mike Perry Date: Tue Dec 29 03:30:50 2015 -0800 CCC Donations link. --- .htaccess |1 + 1 file changed, 1 insertion(+) diff --git a/.htaccess b/.htaccess index 930e802..fb59b90 100644 --- a/.htaccess +++ b/.htaccess @@ -67,6 +67,7 @@ RewriteRule ^donate/donate-hpbanner(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-benw(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-ellsberg(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-alison(.*) /donate/donate$1 [R=302,L] +RewriteRule ^donate/donate-chaos(.*) /donate/donate$1 [R=302,L] #keep prefixes of other entries down here... RewriteRule ^donate/donate-hp(.*) /donate/donate$1 [R=302,L] ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/staging] Fix a typo.
commit bae76872d9376231e1f4d905c42faf8592d93cc4 Author: Mike Perry Date: Mon Nov 30 15:16:01 2015 -0800 Fix a typo. --- donate/en/donate-options.wml |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/donate/en/donate-options.wml b/donate/en/donate-options.wml index 30276f5..00331cd 100644 --- a/donate/en/donate-options.wml +++ b/donate/en/donate-options.wml @@ -167,7 +167,7 @@ account information is as follows: BIC: BYLADEM1ING Sparkasse Ingolstadt Rathausplatz 6 - 85049 Ingolstadt) + 85049 Ingolstadt ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/master] Fix a typo.
commit bae76872d9376231e1f4d905c42faf8592d93cc4 Author: Mike Perry Date: Mon Nov 30 15:16:01 2015 -0800 Fix a typo. --- donate/en/donate-options.wml |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/donate/en/donate-options.wml b/donate/en/donate-options.wml index 30276f5..00331cd 100644 --- a/donate/en/donate-options.wml +++ b/donate/en/donate-options.wml @@ -167,7 +167,7 @@ account information is as follows: BIC: BYLADEM1ING Sparkasse Ingolstadt Rathausplatz 6 - 85049 Ingolstadt) + 85049 Ingolstadt ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/master] Add EU bank transfer info.
commit 3a65d2240fb3b572e25b5e70c817e73d32488c5c Author: Mike Perry Date: Mon Nov 30 15:06:11 2015 -0800 Add EU bank transfer info. --- donate/en/donate-options.wml | 24 ++-- include/donatehead.wmi |2 +- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/donate/en/donate-options.wml b/donate/en/donate-options.wml index 58a63f7..30276f5 100644 --- a/donate/en/donate-options.wml +++ b/donate/en/donate-options.wml @@ -45,6 +45,7 @@ https://smile.amazon.com/ch/20-8096820";>Amazon Smile https://www.dwolla.com/hub/thetorproject";>Dwolla Paypal +EU Bank Transfer Checks or Money Orders @@ -152,8 +153,25 @@ exchange money quickly, safely, at a lower cost. » + + + + Donate via European Bank Transfer + For European bank transfers, we have an arrangement with +the Renewable Freedom Foundation to provide tax-deductible donations for +Europeans. They will issue a donation receipt upon request. The +account information is as follows: + + Renewable Freedom Foundation + IBAN: DE1772150053693701 + BIC: BYLADEM1ING + Sparkasse Ingolstadt + Rathausplatz 6 + 85049 Ingolstadt) + + - + @@ -163,8 +181,10 @@ exchange money quickly, safely, at a lower cost. The Tor Project, Inc 7 Temple Street, Suite A Cambridge, MA 02139-2403 USA - + + + Contact us at donati...@torproject.org for more donation details. diff --git a/include/donatehead.wmi b/include/donatehead.wmi index 7d8d362..0091888 100644 --- a/include/donatehead.wmi +++ b/include/donatehead.wmi @@ -60,7 +60,7 @@ - +
[tor-commits] [webwml/staging] Add EU bank transfer info.
commit 3a65d2240fb3b572e25b5e70c817e73d32488c5c Author: Mike Perry Date: Mon Nov 30 15:06:11 2015 -0800 Add EU bank transfer info. --- donate/en/donate-options.wml | 24 ++-- include/donatehead.wmi |2 +- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/donate/en/donate-options.wml b/donate/en/donate-options.wml index 58a63f7..30276f5 100644 --- a/donate/en/donate-options.wml +++ b/donate/en/donate-options.wml @@ -45,6 +45,7 @@ https://smile.amazon.com/ch/20-8096820";>Amazon Smile https://www.dwolla.com/hub/thetorproject";>Dwolla Paypal +EU Bank Transfer Checks or Money Orders @@ -152,8 +153,25 @@ exchange money quickly, safely, at a lower cost. » + + + + Donate via European Bank Transfer + For European bank transfers, we have an arrangement with +the Renewable Freedom Foundation to provide tax-deductible donations for +Europeans. They will issue a donation receipt upon request. The +account information is as follows: + + Renewable Freedom Foundation + IBAN: DE1772150053693701 + BIC: BYLADEM1ING + Sparkasse Ingolstadt + Rathausplatz 6 + 85049 Ingolstadt) + + - + @@ -163,8 +181,10 @@ exchange money quickly, safely, at a lower cost. The Tor Project, Inc 7 Temple Street, Suite A Cambridge, MA 02139-2403 USA - + + + Contact us at donati...@torproject.org for more donation details. diff --git a/include/donatehead.wmi b/include/donatehead.wmi index 7d8d362..0091888 100644 --- a/include/donatehead.wmi +++ b/include/donatehead.wmi @@ -60,7 +60,7 @@ - +
[tor-commits] [webwml/master] Remove donation header links.
commit 57d6e8b94c1f1daad0d92038c50511e8a66fffe1 Author: Mike Perry Date: Mon Nov 30 14:52:56 2015 -0800 Remove donation header links. They completely ruin the mobile version of the site by taking up half the page, and they distract from the act of donating anyway. --- include/donatehead.wmi |2 ++ 1 file changed, 2 insertions(+) diff --git a/include/donatehead.wmi b/include/donatehead.wmi index 54e866e..7d8d362 100644 --- a/include/donatehead.wmi +++ b/include/donatehead.wmi @@ -61,11 +61,13 @@ + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/staging] Remove donation header links.
commit 57d6e8b94c1f1daad0d92038c50511e8a66fffe1 Author: Mike Perry Date: Mon Nov 30 14:52:56 2015 -0800 Remove donation header links. They completely ruin the mobile version of the site by taking up half the page, and they distract from the act of donating anyway. --- include/donatehead.wmi |2 ++ 1 file changed, 2 insertions(+) diff --git a/include/donatehead.wmi b/include/donatehead.wmi index 54e866e..7d8d362 100644 --- a/include/donatehead.wmi +++ b/include/donatehead.wmi @@ -61,11 +61,13 @@ + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/master] Improve the horribly ugly secondary donation options page.
commit 9419a420f3a9f80c5c02a901f8588299b3a2f864
Author: Mike Perry
Date: Mon Nov 30 13:25:45 2015 -0800
Improve the horribly ugly secondary donation options page.
This is not a masterpiece, but at least it probably won't provoke as much
laughter.
---
donate/en/donate-options.wml | 155 ++
1 file changed, 80 insertions(+), 75 deletions(-)
diff --git a/donate/en/donate-options.wml b/donate/en/donate-options.wml
index ba41c37..58a63f7 100644
--- a/donate/en/donate-options.wml
+++ b/donate/en/donate-options.wml
@@ -2,85 +2,65 @@
# Revision: $Revision$
# Translation-Priority: 3-low
-#include "head.wmi" TITLE="Tor Project: Donate to Tor" CHARSET="UTF-8"
-
-
-Home »
-Donate
-
-
- Make A Donation
- Your support is critical to our success. The
- Tor Project is a US 501(c)(3) non-profit dedicated to research,
- development, and education about online anonymity and privacy. Donations
- to The Tor Project may be tax deductible to persons who are in the
- US; or who pay taxes in countries with reciprocity with the US on
- charitable donations. Our tax ID number is 20-8096820. We are listed on
- http://www2.guidestar.org/organizations/20-8096820/tor-project.aspx";>GuideStar.
+#include "donatehead.wmi" TITLE="Tor Project: Donate to Tor" CHARSET="UTF-8"
+
+
+.hlist {
+padding: 0px;
+text-align: center;
+display: block;
+width: 100%;
+list-style: outside none none;
+margin: 0px 0px 18px;
+}
+
+.hlist li {
+display: inline-block;
+border-right: 1px solid #444;
+margin-left: -4px;
+}
+.hlist a {
+display: block;
+top: 0px;
+right: 0px;
+bottom: 0px;
+left: 0px;
+text-decoration: none;
+font-weight: bold;
+padding: 0px 8px;
+}
- We're happy to have you shop and indirectly support us via
-http://smile.amazon.com/ch/20-8096820";>Amazon Smile. A
-portion of your purchase is donated to help keep us working.
+.hlist li.last {
+border-right: 0px solid #444;
+}
+
- We're happy to accept direct donations via:
+
+
+ Ways to Donate to Tor
+ The Tor Project offers the following donation methods:
-Paypal
-
-Dwolla
Bitcoins
-checks, money orders, or bank
transfers
+Amazon Payments
+https://smile.amazon.com/ch/20-8096820";>Amazon Smile
+https://www.dwolla.com/hub/thetorproject";>Dwolla
+Paypal
+Checks or Money Orders
-Contact us at donati...@torproject.org for more donation details.
-
-
-
-
-
- Donate via Dwolla
- Dwolla is a peer to peer payment platform which allows users to
-exchange money quickly, safely, at a lower cost.
- https://www.dwolla.com/hub/thetorproject";>Continue to Dwolla
-»
-
-
Bitcoins
-Please consider a donation to
-https://www.torservers.net/donate.html";>Torservers.net,
+In order to comply with US 501(c)(3) non-profit regulations, our
Bitcoin transaction limit is currently $10,000 USD per day.
+If you wish to avoid transaction limits, please consider a direct Bitcoin
donation to
+https://www.torservers.net/donate.html#cryptocurrencies";>Torservers.net,
http://noisetor.net/#bitcoin";>NoiseTor,
-or https://tails.boum.org/contribute/how/donate/#bitcoin";>Tails
-which will turn your bitcoin donation into a faster, larger Tor
-Network for all.
- If you are committed to donating bitcoins to Tor, please complete the
form below.
+https://www.oniontip.com/";>OnionTip,
+or https://tails.boum.org/contribute/how/donate/#bitcoin";>Tails.
+ If this transaction limit is not an issue for you, please complete the
form below:
https://bitpay.com/checkout"; method="post"
onsubmit="return bp.validateMobileCheckoutForm($('#makeDonation'));">
@@ -145,24 +125,49 @@ href="https://www.dwolla.com/hub/thetorproject";>Continue
to Dwolla
+
+
+
+ Donate via Amazon
+ Amazon Payments allows you to donate to Tor via several different
+mechanisms using an Amazon account.
+ Donate via Amazon Payments
+»
+
+
+ Donate via Amazon Smile
+ Amazon Smile allows you to donate 0.5% of your Amazon purchases to
the Tor Project.
+ https://smile.amazon.com/ch/20-8096820";>Donate with Amazon Smile
+»
+
+
+
+
+
+ Donate via Dwolla
+ Dwolla is a peer to peer payment platform which allows users to
+exchange money quickly, safely, at a lower cost.
+ https://www.dwolla.com/hub/thetorproject";>Donate via Dwolla
+»
+
+
+
- Donate via Check, Cash, Money Order, Bank Transfer
+ Donate via Check or Money Order
You can send checks or money orders to:
The Tor Project, Inc
7 Temple Street, Suite A
Cambridge, MA 02139-2403 USA
-
-
-
-#include "side-donate.wmi"
-#inc
[tor-commits] [webwml/staging] Provide a height for the page footer
commit 0f0351daae4e0b4dadc1975d021d9ca318a22bbd
Author: Sebastian Hahn
Date: Wed Nov 25 17:27:26 2015 +0100
Provide a height for the page footer
---
include/donatehead.wmi |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/donatehead.wmi b/include/donatehead.wmi
index 8d0b35c..54e866e 100644
--- a/include/donatehead.wmi
+++ b/include/donatehead.wmi
@@ -32,7 +32,7 @@
}
body {
- margin-bottom: 60px;
+ margin-bottom: 65px;
}
.footer {
@@ -40,7 +40,7 @@
bottom: 0;
width: 100%;
/* Set the height of the footer here */
- height: auto;
+ height: 65px;
padding-top: 10px;
padding-bottom: 10px;
background-color: #f5f5f5;
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/staging] Add link to donor page (#17681)
commit cd0da7497adc1f435a0de4c409239c5fbe056ef5 Author: Sebastian Hahn Date: Wed Nov 25 11:04:57 2015 +0100 Add link to donor page (#17681) --- donate/en/donor-faq.wml |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/donate/en/donor-faq.wml b/donate/en/donor-faq.wml index 2fff4ab..e9005b4 100644 --- a/donate/en/donor-faq.wml +++ b/donate/en/donor-faq.wml @@ -147,7 +147,7 @@ Can I become a Tor Project member? -Right now, we don't have a membership program, but we may set one up in the future. If you want to get involved with the Tor Project, this is a good place to start. +Right now, we don't have a membership program, but we may set one up in the future. If you want to get involved with the Tor Project, this is a good place to start. How can I get a Tor t-shirt or stickers? @@ -199,4 +199,4 @@ -#include \ No newline at end of file +#include ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/staging] Improve the horribly ugly secondary donation options page.
commit 9419a420f3a9f80c5c02a901f8588299b3a2f864
Author: Mike Perry
Date: Mon Nov 30 13:25:45 2015 -0800
Improve the horribly ugly secondary donation options page.
This is not a masterpiece, but at least it probably won't provoke as much
laughter.
---
donate/en/donate-options.wml | 155 ++
1 file changed, 80 insertions(+), 75 deletions(-)
diff --git a/donate/en/donate-options.wml b/donate/en/donate-options.wml
index ba41c37..58a63f7 100644
--- a/donate/en/donate-options.wml
+++ b/donate/en/donate-options.wml
@@ -2,85 +2,65 @@
# Revision: $Revision$
# Translation-Priority: 3-low
-#include "head.wmi" TITLE="Tor Project: Donate to Tor" CHARSET="UTF-8"
-
-
-Home »
-Donate
-
-
- Make A Donation
- Your support is critical to our success. The
- Tor Project is a US 501(c)(3) non-profit dedicated to research,
- development, and education about online anonymity and privacy. Donations
- to The Tor Project may be tax deductible to persons who are in the
- US; or who pay taxes in countries with reciprocity with the US on
- charitable donations. Our tax ID number is 20-8096820. We are listed on
- http://www2.guidestar.org/organizations/20-8096820/tor-project.aspx";>GuideStar.
+#include "donatehead.wmi" TITLE="Tor Project: Donate to Tor" CHARSET="UTF-8"
+
+
+.hlist {
+padding: 0px;
+text-align: center;
+display: block;
+width: 100%;
+list-style: outside none none;
+margin: 0px 0px 18px;
+}
+
+.hlist li {
+display: inline-block;
+border-right: 1px solid #444;
+margin-left: -4px;
+}
+.hlist a {
+display: block;
+top: 0px;
+right: 0px;
+bottom: 0px;
+left: 0px;
+text-decoration: none;
+font-weight: bold;
+padding: 0px 8px;
+}
- We're happy to have you shop and indirectly support us via
-http://smile.amazon.com/ch/20-8096820";>Amazon Smile. A
-portion of your purchase is donated to help keep us working.
+.hlist li.last {
+border-right: 0px solid #444;
+}
+
- We're happy to accept direct donations via:
+
+
+ Ways to Donate to Tor
+ The Tor Project offers the following donation methods:
-Paypal
-
-Dwolla
Bitcoins
-checks, money orders, or bank
transfers
+Amazon Payments
+https://smile.amazon.com/ch/20-8096820";>Amazon Smile
+https://www.dwolla.com/hub/thetorproject";>Dwolla
+Paypal
+Checks or Money Orders
-Contact us at donati...@torproject.org for more donation details.
-
-
-
-
-
- Donate via Dwolla
- Dwolla is a peer to peer payment platform which allows users to
-exchange money quickly, safely, at a lower cost.
- https://www.dwolla.com/hub/thetorproject";>Continue to Dwolla
-»
-
-
Bitcoins
-Please consider a donation to
-https://www.torservers.net/donate.html";>Torservers.net,
+In order to comply with US 501(c)(3) non-profit regulations, our
Bitcoin transaction limit is currently $10,000 USD per day.
+If you wish to avoid transaction limits, please consider a direct Bitcoin
donation to
+https://www.torservers.net/donate.html#cryptocurrencies";>Torservers.net,
http://noisetor.net/#bitcoin";>NoiseTor,
-or https://tails.boum.org/contribute/how/donate/#bitcoin";>Tails
-which will turn your bitcoin donation into a faster, larger Tor
-Network for all.
- If you are committed to donating bitcoins to Tor, please complete the
form below.
+https://www.oniontip.com/";>OnionTip,
+or https://tails.boum.org/contribute/how/donate/#bitcoin";>Tails.
+ If this transaction limit is not an issue for you, please complete the
form below:
https://bitpay.com/checkout"; method="post"
onsubmit="return bp.validateMobileCheckoutForm($('#makeDonation'));">
@@ -145,24 +125,49 @@ href="https://www.dwolla.com/hub/thetorproject";>Continue
to Dwolla
+
+
+
+ Donate via Amazon
+ Amazon Payments allows you to donate to Tor via several different
+mechanisms using an Amazon account.
+ Donate via Amazon Payments
+»
+
+
+ Donate via Amazon Smile
+ Amazon Smile allows you to donate 0.5% of your Amazon purchases to
the Tor Project.
+ https://smile.amazon.com/ch/20-8096820";>Donate with Amazon Smile
+»
+
+
+
+
+
+ Donate via Dwolla
+ Dwolla is a peer to peer payment platform which allows users to
+exchange money quickly, safely, at a lower cost.
+ https://www.dwolla.com/hub/thetorproject";>Donate via Dwolla
+»
+
+
+
- Donate via Check, Cash, Money Order, Bank Transfer
+ Donate via Check or Money Order
You can send checks or money orders to:
The Tor Project, Inc
7 Temple Street, Suite A
Cambridge, MA 02139-2403 USA
-
-
-
-#include "side-donate.wmi"
-#inc
[tor-commits] [webwml/staging] Give the footer a bit more space
commit 7debd7b84d01160fc48e675642372687f5b04f59
Author: Sebastian Hahn
Date: Wed Nov 25 16:50:50 2015 +0100
Give the footer a bit more space
---
include/donatehead.wmi |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/donatehead.wmi b/include/donatehead.wmi
index d0c20a4..8d0b35c 100644
--- a/include/donatehead.wmi
+++ b/include/donatehead.wmi
@@ -48,7 +48,7 @@
.donation{
text-align: center;
- padding-bottom: 60px;
+ padding-bottom: 65px;
}
h6{
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/staging] Fix links in donate page header
commit 9ecd1937383fb4a80c9896cae7e8b174a8cf23b2 Author: Sebastian Hahn Date: Wed Nov 25 11:10:02 2015 +0100 Fix links in donate page header --- include/donatehead.wmi |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/donatehead.wmi b/include/donatehead.wmi index 616c461..d0c20a4 100644 --- a/include/donatehead.wmi +++ b/include/donatehead.wmi @@ -62,9 +62,9 @@ - Home - About - Contact + Home + About + Contact ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/staging] Fix a wml parsing issue.
commit f94a702b5e5e116c4eb9df4ae6ae795f36f48fda Author: Mike Perry Date: Tue Nov 24 17:12:44 2015 -0800 Fix a wml parsing issue. It doesn't like the space and inserts another quote. Maybe this is what is breaking Webkit browsers on mobile? --- include/donatehead.wmi |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/donatehead.wmi b/include/donatehead.wmi index 284f3d1..616c461 100644 --- a/include/donatehead.wmi +++ b/include/donatehead.wmi @@ -12,7 +12,7 @@ - + https://www.torproject.org/images/tor-logo.jpg";> ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/master] Fix a wml parsing issue.
commit f94a702b5e5e116c4eb9df4ae6ae795f36f48fda Author: Mike Perry Date: Tue Nov 24 17:12:44 2015 -0800 Fix a wml parsing issue. It doesn't like the space and inserts another quote. Maybe this is what is breaking Webkit browsers on mobile? --- include/donatehead.wmi |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/donatehead.wmi b/include/donatehead.wmi index 284f3d1..616c461 100644 --- a/include/donatehead.wmi +++ b/include/donatehead.wmi @@ -12,7 +12,7 @@ - + https://www.torproject.org/images/tor-logo.jpg";> ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/staging] Merge remote-tracking branch 'isa/test'
commit f936d0b593d3b81d0298b7e97eb6531e53ff709e
Merge: 9944a0e 86e6088
Author: Mike Perry
Date: Mon Nov 23 23:37:20 2015 -0800
Merge remote-tracking branch 'isa/test'
07:28 <+mikeperry> fuck waiting. its only europe
yeah, I said that.
.htaccess |8 +
README.md |1 +
css/bootstrap.css | 6027
donate/en/campaign-swag.wml| 84 +
donate/en/donate-amazon.wml| 42 +
donate/en/donate-options.wml | 28 -
donate/en/donate.wml | 205 +-
donate/en/donor-faq.wml| 202 ++
donate/en/donor-privacy-policy.wml | 29 +
en/navigation.wmi |2 +-
getinvolved/en/tshirt.wml |3 +-
images/campaign-hoody.jpg | Bin 0 -> 55689 bytes
images/campaign-t-shirt-1.jpg | Bin 0 -> 44107 bytes
images/campaign-t-shirt-2.jpg | Bin 0 -> 50638 bytes
images/cory-doctorow.jpg | Bin 0 -> 15747 bytes
images/laura_poitras.jpg | Bin 0 -> 31763 bytes
images/sticker-pack.jpg| Bin 0 -> 42540 bytes
include/donatefoot.wmi | 10 +
include/donatehead.wmi | 117 +-
19 files changed, 6538 insertions(+), 220 deletions(-)
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/staging] Have the website admit that 0.2.7.5 is stable
commit 9944a0e37db47dcf39d752beacb3c0820095c17d Author: Nick Mathewson Date: Sun Nov 22 20:39:21 2015 -0500 Have the website admit that 0.2.7.5 is stable --- Makefile |2 +- include/versions.wmi |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 16a3328..7897228 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ # website component, and set it to needs_review. export STABLETAG=tor-0.2.6.10 -export DEVTAG=tor-0.2.7.4-rc +export DEVTAG=tor-0.2.7.5 WMLBASE=. diff --git a/include/versions.wmi b/include/versions.wmi index 7a22419..e05d00c 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -1,5 +1,5 @@ 0.2.6.10 -0.2.7.4-rc +0.2.7.5 0.2.6.10 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/master] first commit
commit 6c738818f98fc4e78afdb31f3de9b218be72e74e
Author: toya
Date: Mon Nov 23 09:57:39 2015 -0800
first commit
---
README.md |1 +
css/bootstrap.css |1 -
donate/en/donate.wml | 10 +-
donate/en/donor-faq.wml| 189 +++-
donate/en/donor-privacy-policy.wml | 24 ++---
5 files changed, 186 insertions(+), 39 deletions(-)
diff --git a/README.md b/README.md
index 974188d..fda3cb4 100644
--- a/README.md
+++ b/README.md
@@ -118,3 +118,4 @@ packages in dist/ less awful -- automatically check that
they have
signatures and that the sigs match, that the items on the website are in
fact in dist, only allow certain people to put files in certain places,
etc. One day! :)
+# tp_donation
diff --git a/css/bootstrap.css b/css/bootstrap.css
index a5f2a34..90512be 100755
--- a/css/bootstrap.css
+++ b/css/bootstrap.css
@@ -1482,7 +1482,6 @@ abbr[data-original-title] {
}
blockquote {
padding: 10px 20px;
- margin: 0 0 20px;
font-size: 17.5px;
border-left: 5px solid #ee;
}
diff --git a/donate/en/donate.wml b/donate/en/donate.wml
index 18d5fe2..86be294 100644
--- a/donate/en/donate.wml
+++ b/donate/en/donate.wml
@@ -8,12 +8,13 @@
-
+
This is what a Tor supporter looks like:
+
-
+
Laura Poitras
"Edward Snowden would not
have been able to contact me without Tor and other free software encryption
projects. Journalists need Tor to protect their sources and to research freely.
It is an essential tool, and it needs our support."
@@ -30,14 +31,13 @@
10
100
256
- 23
+ 50
500
1
$
-
-.00
+
diff --git a/donate/en/donor-faq.wml b/donate/en/donor-faq.wml
index 55b3412..950cd76 100644
--- a/donate/en/donor-faq.wml
+++ b/donate/en/donor-faq.wml
@@ -5,48 +5,193 @@
#include "donatehead.wmi" TITLE="Donate to keep Tor alive!" CHARSET="UTF-8"
-
- Support Tor!
+
+
+ Back to donate page!
+
Donor FAQ
-
+
+
+What is the Tor Project and what does it
do?
+The Tor Project’s mission is to advance human rights and
freedoms by creating and deploying free and open anonymity and privacy
technologies, supporting their unrestricted availability and use, and
furthering their scientific and popular understanding. The main product of the
Tor Project is the Tor Browser, which enables people to browse the internet
anonymously. The Tor Project is a 501(c)3 tax-exempt non-profit organization
based in Boston, Massachusetts. It was founded in 2006.
+
+
+Who works for the Tor Project, and what do they
do?
+Thousands of people around the world actively support the work
of the Tor Project, including developers, designers, relay operators,
researchers, cryptographers, computer scientists, and privacy advocates. Most
are not paid by the Tor Project; even our very small staff includes many
volunteers. You can read about the core contributors to the Tor Project on our
https://www.torproject.org/about/corepeople.html.en";
target="_blank">Core People page.
+
+
+Who uses Tor?
+The vast majority of Tor users are ordinary people who want
control of their privacy online or people whose internet use is censored. Other
Tor users are journalists, human rights defenders, domestic violence survivors,
policymakers, diplomats, and academic and research institutions.
+
+
+Can anyone use Tor?
+Yes! Tor is free, and anyone can use it. To get started, you
will need to https://www.torproject.org/projects/torbrowser.html.en";
target="_blank">download the Tor browser. We offer instructions on how to
download for https://www.torproject.org/projects/torbrowser.html.en#windows";
target="_blank">Windows, https://www.torproject.org/projects/torbrowser.html.en#macosx";
target="_blank">Mac OS X and https://www.torproject.org/projects/torbrowser.html.en#linux";
target="_blank">Linux.
+
-Lorem ipsum dolor sit amet, nibh scelerisque adipiscing
facilisis, ut turpis aenean quam?
-Lorem ipsum dolor sit amet, turpis ipsum rhoncus odio, pharetra
egestas sapien pulvinar, donec cursus in dictum curabitur. Erat dolor massa
nonummy nulla, quasi lorem ipsum integer
[tor-commits] [webwml/master] Merge remote-tracking branch 'isa/donation-updates' into staging
commit 5375b1adecac9fef1dd88a18e2257d6463d5ffa7 Merge: 19167d5 6c73881 Author: Mike Perry Date: Mon Nov 23 10:52:21 2015 -0800 Merge remote-tracking branch 'isa/donation-updates' into staging README.md |1 + css/bootstrap.css |1 - donate/en/donate.wml | 10 +- donate/en/donor-faq.wml| 189 +++- donate/en/donor-privacy-policy.wml | 24 ++--- 5 files changed, 186 insertions(+), 39 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/master] Merge remote-tracking branch 'isa/test'
commit f936d0b593d3b81d0298b7e97eb6531e53ff709e
Merge: 9944a0e 86e6088
Author: Mike Perry
Date: Mon Nov 23 23:37:20 2015 -0800
Merge remote-tracking branch 'isa/test'
07:28 <+mikeperry> fuck waiting. its only europe
yeah, I said that.
.htaccess |8 +
README.md |1 +
css/bootstrap.css | 6027
donate/en/campaign-swag.wml| 84 +
donate/en/donate-amazon.wml| 42 +
donate/en/donate-options.wml | 28 -
donate/en/donate.wml | 205 +-
donate/en/donor-faq.wml| 202 ++
donate/en/donor-privacy-policy.wml | 29 +
en/navigation.wmi |2 +-
getinvolved/en/tshirt.wml |3 +-
images/campaign-hoody.jpg | Bin 0 -> 55689 bytes
images/campaign-t-shirt-1.jpg | Bin 0 -> 44107 bytes
images/campaign-t-shirt-2.jpg | Bin 0 -> 50638 bytes
images/cory-doctorow.jpg | Bin 0 -> 15747 bytes
images/laura_poitras.jpg | Bin 0 -> 31763 bytes
images/sticker-pack.jpg| Bin 0 -> 42540 bytes
include/donatefoot.wmi | 10 +
include/donatehead.wmi | 117 +-
19 files changed, 6538 insertions(+), 220 deletions(-)
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/master] Adding swag page, update tshirt page and small changes to the other pages.
commit 86e6088dfddb7c7ef6c41ee79c5c124603e88869 Author: toya Date: Mon Nov 23 22:35:18 2015 -0800 Adding swag page, update tshirt page and small changes to the other pages. --- donate/en/campaign-swag.wml| 84 donate/en/donate.wml |8 ++-- donate/en/donor-faq.wml| 13 -- donate/en/donor-privacy-policy.wml |4 +- getinvolved/en/tshirt.wml |3 +- images/campaign-hoody.jpg | Bin 0 -> 55689 bytes images/campaign-t-shirt-1.jpg | Bin 0 -> 44107 bytes images/campaign-t-shirt-2.jpg | Bin 0 -> 50638 bytes images/sticker-pack.jpg| Bin 0 -> 42540 bytes 9 files changed, 100 insertions(+), 12 deletions(-) diff --git a/donate/en/campaign-swag.wml b/donate/en/campaign-swag.wml new file mode 100644 index 000..43969e9 --- /dev/null +++ b/donate/en/campaign-swag.wml @@ -0,0 +1,84 @@ +## translation metadata +# Revision: $Revision$ +# Translation-Priority: 3-low + +#include "donatehead.wmi" TITLE="Donate to keep Tor alive!" CHARSET="UTF-8" + + + + + Back to donate page! + + + Thank you for your donation! + + + + $23+ donation is eligible for a sticker pack. + You will receive an assortment of Tor stickers plus our exclusive "Tor Supporter" sticker. Display with pride! :) + + + + $100+ donation is eligible for 1 t-shirt. Select your style and size. + Both T-shirts are: + + 100% pre-shrunk organic cotton + Water-based silk screen print + Made fairly + Certification: GOTS + + + + + + + + T-Shirt Design Option #1 + (Limited Edition and exclusive to this campaign!) + THIS IS WHAT A TOR SUPPORTER LOOKS LIKE + Color: Black + Sizes available: + Men S, M, L, XL, XXL + Women S, M, L + + + + T-Shirt Design Option #2 + ROOTS + Color: Black + Sizes available: + Men S, M, L, XL, XXL + Women S, M, L + + + + $500+ donation is eligible for 1 hooded sweatshirt. + Hooded sweatshirts are: + + 100% pre-shrunk organic cotton + Water-based silk screen print + Made fairly + Certification: GOTS + + + + + Select your size. + Hoodie Design #1 (Limited Edition!) + ROOTS + Color: Black + Sizes available: + Men S, M, L, XL, XXL + W
[tor-commits] [webwml/master] Fix paypal glitch.
commit 19167d525198145049b08af0f62b7c3d91d1d837
Author: Mike Perry
Date: Sun Nov 22 19:28:39 2015 -0800
Fix paypal glitch.
---
donate/en/donate.wml |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/donate/en/donate.wml b/donate/en/donate.wml
index 18d5fe2..865e90c 100644
--- a/donate/en/donate.wml
+++ b/donate/en/donate.wml
@@ -97,7 +97,7 @@ function displayVals() {
jQuery(function(){
jQuery("button[name='amnt']").click(displayVals);
- jQuery("input[name='cmd']").click(displayVals);
+ //jQuery("input[name='cmd']").click(displayVals);
jQuery("#exampleInputAmount").click(displayVals);
jQuery("#exampleInputAmount").change(displayVals);
displayVals();
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/master] Donate page: Fix the radio button toggle amount glitch.
commit f59d43d479637a6c722e4b0a276fdde5ee3b946c
Author: Mike Perry
Date: Sun Nov 22 18:33:04 2015 -0800
Donate page: Fix the radio button toggle amount glitch.
---
donate/en/donate.wml |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/donate/en/donate.wml b/donate/en/donate.wml
index 2b8a0b9..18d5fe2 100644
--- a/donate/en/donate.wml
+++ b/donate/en/donate.wml
@@ -36,7 +36,7 @@
1
$
-
+
.00
@@ -82,7 +82,7 @@ function displayVals() {
amount = $( this ).filter("input").val();
if (amount == null) {
amount = 100;
-} else {
+} else if (this.id == "exampleInputAmount") {
$( "button" ).removeClass('active');
$( this ).addClass('active');
}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/master] Fix donate page footer
commit 9f02c8d3b905948e7489d4a21a996b81bb478a78
Author: Sebastian Hahn
Date: Fri Nov 20 16:34:12 2015 +0100
Fix donate page footer
---
donate/en/donate.wml | 55 +---
include/donatefoot.wmi |2 +-
2 files changed, 2 insertions(+), 55 deletions(-)
diff --git a/donate/en/donate.wml b/donate/en/donate.wml
index 1062f42..2b8a0b9 100644
--- a/donate/en/donate.wml
+++ b/donate/en/donate.wml
@@ -103,57 +103,4 @@ jQuery(function(){
displayVals();
});
-
-
-
-# include
+#include
diff --git a/include/donatefoot.wmi b/include/donatefoot.wmi
index 3d42bef..8955182 100644
--- a/include/donatefoot.wmi
+++ b/include/donatefoot.wmi
@@ -2,7 +2,7 @@
The Tor Project is a 501(c)(3) US
non-profit organization dedicated to research, development, and education about
online anonymity and privacy.
- Privacy Policy & Donor FAQ
+ Privacy Policy & Donor FAQ
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/master] New attempt at amazon button
commit e291ed80de191ff5a54e36a0fb251947a697ff34 Author: Sebastian Hahn Date: Fri Nov 20 14:14:15 2015 +0100 New attempt at amazon button --- donate/en/donate-amazon.wml | 20 +++- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/donate/en/donate-amazon.wml b/donate/en/donate-amazon.wml index 0d4799f..591b97b 100644 --- a/donate/en/donate-amazon.wml +++ b/donate/en/donate-amazon.wml @@ -10,8 +10,7 @@ -https://static-na.payments-amazon.com/OffAmazonPayments/us/js/Widgets.js";> +https://static-na.payments-amazon.com/OffAmazonPayments/us/js/Widgets.js";> https://static-na.payments-amazon.com/OffAmazonPayments/us/js/Widgets.js";>< data-ap-signature="%2B6UiARhqtXOPGLHP%2F6DrD3zH68ZHxmA9tBLjfjJ3jYU%3D" data-ap-seller-id="A3KD3XX49657E7" data-ap-access-key="AKIAISELZYVMUQ7F5M7Q" - -data-ap-lwa-client-id="amzn1.application-oa2-client.b0b3efe8eb6841ed800ff2cc45b12dba" + data-ap-lwa-client-id="amzn1.application-oa2-client.b0b3efe8eb6841ed800ff2cc45b12dba" data-ap-return-url="https://www.torproject.org/donate/thankyou"; data-ap-currency-code="USD" data-ap-amount="0" -data-ap-note="Thank you for your donation to The Tor Project. The -Tor Project is a 501c3 organization, and our federal tax ID number is -20-8096820. Your gift is tax deductible in the United States as allowed -by law. The Tor Project respects the confidentiality of its supporters, -and we do not lend, rent, or sell our lists of donors at any time. Your -donation enables Tor developers to focus on making Tor better, including -scalability, user support and better documentation, usability and -incentives, and research into better privacy approaches. If you would -like to keep in touch or get more involved, please visit us at -www.torproject.org. Our mission is to advance human rights and freedoms -by creating and deploying free and open anonymity and privacy -technologies, supporting their unrestricted availability and use, and -furthering their scientific and popular understanding. " +data-ap-note="Thank you for your donation to The Tor Project. The Tor Project is a 501c3 organization, and our federal tax ID number is 20-8096820. Your gift is tax deductible in the United States as allowed by law. The Tor Project respects the confidentiality of its supporters, and we do not lend, rent, or sell our lists of donors at any time. Your donation enables Tor developers to focus on making Tor better, including scalability, user support and better documentation, usability and incentives, and research into better privacy approaches. If you would like to keep in touch or get more involved, please visit us at www.torproject.org. Our mission is to advance human rights and freedoms by creating and deploying free and open anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding. " data-ap-shipping-address-required="false" data-ap-payment-action="AuthorizeAndCapture" > ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/master] Update the amazon donate test page yet again
commit c3d476f2c77d13f5ac6a90d646bc86834a992886 Author: Sebastian Hahn Date: Fri Nov 6 04:26:37 2015 +0100 Update the amazon donate test page yet again --- donate/en/donate-amazon.wml | 21 + 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/donate/en/donate-amazon.wml b/donate/en/donate-amazon.wml index 172837c..bcb96f4 100644 --- a/donate/en/donate-amazon.wml +++ b/donate/en/donate-amazon.wml @@ -17,14 +17,27 @@ src="https://static-na.payments-amazon.com/OffAmazonPayments/us/js/Widgets.js";>< data-ap-widget-theme="ap-light" data-ap-widget-amount-presets="5,25,50,100" data-ap-widget-default-amount="1" -data-ap-signature="jYgV1hBxbXKAVft1K%2Bq8QdZ%2Bl1rIEcn4e5trkhjotk8%3D" +data-ap-signature="TccqAE9jXn74b3xQgYc5rFG9Y9N3Rbq3ihSQQfF0plg%3D" data-ap-seller-id="A3KD3XX49657E7" data-ap-access-key="AKIAISELZYVMUQ7F5M7Q" - data-ap-lwa-client-id="amzn1.application-oa2-client.b0b3efe8eb6841ed800ff2cc45b12dba" -data-ap-return-url="https://www.torproject.org/"; + +data-ap-lwa-client-id="amzn1.application-oa2-client.b0b3efe8eb6841ed800ff2cc45b12dba" +data-ap-return-url="https://www.torproject.org/donate/thankyou"; data-ap-currency-code="USD" data-ap-amount="0" -data-ap-note="" +data-ap-note="Thank you for your donation to The Tor Project. The +Tor Project is a 501c3 organization, and our federal tax ID number is 20 +8096820. Your gift is tax deductible in the United States as allowed by +law. The Tor Project respects the confidentiality of its supporters, +and we do not lend, rent, or sell our lists of donors at any time. Your +donation enables Tor developers to focus on making Tor better, including +scalability, user support and better documentation, usability and +incentives, and research into better privacy approaches. If you would +like to keep in touch or get more involved, please visit us at +www.torproject.org. Our mission is to advance human rights and freedoms +by creating and deploying free and open anonymity and privacy +technologies, supporting their unrestricted availability and use, and +furthering their scientific and popular understanding." data-ap-shipping-address-required="false" data-ap-payment-action="AuthorizeAndCapture" > ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/master] Merge remote-tracking branch 'origin/master' into staging
commit 32fabd39ebd2a1716b55f33e37901aa009a359ca Merge: 172fab9 65c2448 Author: Sebastian Hahn Date: Tue Nov 17 14:33:16 2015 +0100 Merge remote-tracking branch 'origin/master' into staging docs/en/rpms.wml |6 +++--- download/en/download-easy.wml |2 +- download/en/download.wml |4 ++-- getinvolved/en/volunteer.wml |2 +- include/versions.wmi | 22 +++--- projects/en/torbrowser.wml | 28 ++-- projects/torbrowser/RecommendedTBBVersions | 18 ++ 7 files changed, 54 insertions(+), 28 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/master] Try the donation redirect hack
commit 1c3f8602692fd0baea1b335c83b3a0b31ce255df Author: Sebastian Hahn Date: Fri Nov 20 17:13:31 2015 +0100 Try the donation redirect hack --- .htaccess |7 +++ en/navigation.wmi |2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index 6cdca66..1b40159 100644 --- a/.htaccess +++ b/.htaccess @@ -50,3 +50,10 @@ RewriteRule ^easy-download(.*) /download/download-easy$1 [R=301,L] # Relays RewriteRule ^relays(.*) /getinvolved/relays [R=301,L] + +# Donation campagin +RewriteRule ^donate-twitter(.*) /donate/donate$1 [R=302,L] +RewriteRule ^donate-hp(.*) /donate/donate$1 [R=302,L] +RewriteRule ^donate-tbb(.*) /donate/donate$1 [R=302,L] +RewriteRule ^donate-banner(.*) /donate/donate$1 [R=302,L] +RewriteRule ^donate-download(.*) /donate/donate$1 [R=302,L] diff --git a/donate/en/donate-banner.wml b/donate/en/donate-banner.wml new file mode 100644 index 000..e69de29 diff --git a/donate/en/donate-download.wml b/donate/en/donate-download.wml new file mode 100644 index 000..e69de29 diff --git a/donate/en/donate-hp.wml b/donate/en/donate-hp.wml new file mode 100644 index 000..e69de29 diff --git a/donate/en/donate-tbb.wml b/donate/en/donate-tbb.wml new file mode 100644 index 000..e69de29 diff --git a/donate/en/donate-twitter.wml b/donate/en/donate-twitter.wml new file mode 100644 index 000..e69de29 diff --git a/en/navigation.wmi b/en/navigation.wmi index ce8b001..504f29d 100644 --- a/en/navigation.wmi +++ b/en/navigation.wmi @@ -22,7 +22,7 @@ my @calltoaction = ( 'download/download-easy', 'Download', 'getinvolved/volunteer', 'Volunteer', -'donate/donate', 'Donate', +'donate/donate-button', 'Donate', ); :> ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/master] Update amazon donation test page
commit 940ac35b8be7d36fbbdaf8d0af26c199af6a6ca8 Author: Sebastian Hahn Date: Wed Nov 4 21:11:35 2015 +0100 Update amazon donation test page --- donate/en/donate-amazon.wml | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/donate/en/donate-amazon.wml b/donate/en/donate-amazon.wml index 2c2bf95..172837c 100644 --- a/donate/en/donate-amazon.wml +++ b/donate/en/donate-amazon.wml @@ -11,23 +11,22 @@ https://static-na.payments-amazon.com/OffAmazonPayments/us/sandbox/js/Widgets.js";> +src="https://static-na.payments-amazon.com/OffAmazonPayments/us/js/Widgets.js";> https://www.torproject.org"; + data-ap-lwa-client-id="amzn1.application-oa2-client.b0b3efe8eb6841ed800ff2cc45b12dba" +data-ap-return-url="https://www.torproject.org/"; data-ap-currency-code="USD" data-ap-amount="0" data-ap-note="" data-ap-shipping-address-required="false" -data-ap-payment-action="None" +data-ap-payment-action="AuthorizeAndCapture" > ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/master] One more redirect page
commit 3e3228912f9e0644ce1daed0f3450779dc9c61ea Author: Sebastian Hahn Date: Fri Nov 20 17:25:01 2015 +0100 One more redirect page --- 0 files changed diff --git a/donate/en/donate-button.wml b/donate/en/donate-button.wml new file mode 100644 index 000..e69de29 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/master] include some images
commit f64b50364a69969def6651ae6d994ea8c6be2b5b Author: Sebastian Hahn Date: Fri Nov 20 15:57:44 2015 +0100 include some images --- donate/en/donate.wml |2 +- images/cory-doctorow.jpg | Bin 0 -> 15747 bytes images/laura_poitras.jpg | Bin 0 -> 31763 bytes include/donatehead.wmi |2 +- 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/donate/en/donate.wml b/donate/en/donate.wml index 1c09bd5..1062f42 100644 --- a/donate/en/donate.wml +++ b/donate/en/donate.wml @@ -11,7 +11,7 @@ This is what a Tor supporter looks like: - + Laura Poitras diff --git a/images/cory-doctorow.jpg b/images/cory-doctorow.jpg new file mode 100644 index 000..3df9c2f Binary files /dev/null and b/images/cory-doctorow.jpg differ diff --git a/images/laura_poitras.jpg b/images/laura_poitras.jpg new file mode 100644 index 000..fecb40d Binary files /dev/null and b/images/laura_poitras.jpg differ diff --git a/include/donatehead.wmi b/include/donatehead.wmi index 07dbbe7..284f3d1 100644 --- a/include/donatehead.wmi +++ b/include/donatehead.wmi @@ -60,7 +60,7 @@ - https://www.torproject.org/images/tor-logo.jpg"; alt="Tor Project"> + Home About ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/master] Fix donate redirect rules
commit ac94eb4d8356daf484b7f925cd2d5d7e2d472d7d Author: Sebastian Hahn Date: Fri Nov 20 17:42:16 2015 +0100 Fix donate redirect rules --- .htaccess | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.htaccess b/.htaccess index 1b40159..a051529 100644 --- a/.htaccess +++ b/.htaccess @@ -52,8 +52,9 @@ RewriteRule ^easy-download(.*) /download/download-easy$1 [R=301,L] RewriteRule ^relays(.*) /getinvolved/relays [R=301,L] # Donation campagin -RewriteRule ^donate-twitter(.*) /donate/donate$1 [R=302,L] -RewriteRule ^donate-hp(.*) /donate/donate$1 [R=302,L] -RewriteRule ^donate-tbb(.*) /donate/donate$1 [R=302,L] -RewriteRule ^donate-banner(.*) /donate/donate$1 [R=302,L] -RewriteRule ^donate-download(.*) /donate/donate$1 [R=302,L] +RewriteRule ^donate/donate-twitter(.*) /donate/donate$1 [R=302,L] +RewriteRule ^donate/donate-hp(.*) /donate/donate$1 [R=302,L] +RewriteRule ^donate/donate-tbb(.*) /donate/donate$1 [R=302,L] +RewriteRule ^donate/donate-banner(.*) /donate/donate$1 [R=302,L] +RewriteRule ^donate/donate-download(.*) /donate/donate$1 [R=302,L] +RewriteRule ^donate/donate-button(.*) /donate/donate$1 [R=302,L] ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/master] remove the ccc donations option
commit c8dba8e94ed43e657235c42fc7c72efcaa7cc097 Author: Roger Dingledine Date: Sun Nov 22 17:56:51 2015 -0500 remove the ccc donations option since we don't have visibility into what they get or how it gets spent, and julius and andreas both suggest removing it. --- donate/en/donate-options.wml | 28 1 file changed, 28 deletions(-) diff --git a/donate/en/donate-options.wml b/donate/en/donate-options.wml index 3aeed1a..ba41c37 100644 --- a/donate/en/donate-options.wml +++ b/donate/en/donate-options.wml @@ -156,34 +156,6 @@ href="https://www.dwolla.com/hub/thetorproject";>Continue to Dwolla 7 Temple Street, Suite A Cambridge, MA 02139-2403 USA - - Donate via European Bank Transfer - For European bank transfers, we have an arrangement with -http://www.ccc.de/";>CCC in Germany to provide -tax-deductible donations for Europeans: -Wau Holland Stiftung -Commerzbank Kassel -BLZ: 52040021 -Konto: 2772812-02 -IBAN: DE03 5204 0021 0277 2812 02 -BIC: COBADEFF520 *or* COBADEFFXXX - - Residents from any of the 31 http://en.wikipedia.org/wiki/Single_Euro_Payments_Area";>SEPA - member states can wire up to 50.000 Euro at the cost of - a domestic transaction (i.e., usually free if submitted - electronically). - European citizens can make a charitable contribution that - is tax-deductible to a certain degree (Germany: max 20% of total income). - - Corporate entities can deduct donations up to 4/1000 of - their combined turnovers, wages and salaries. WHS issues - a donation receipt upon request (if provided with address - information). - - - - ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/master] add donate-amazon page
commit 0929fad096d35cce80fc662a2525d8ffc0da08f5 Author: Sebastian Hahn Date: Mon Oct 26 19:07:28 2015 +0100 add donate-amazon page --- donate/en/donate-amazon.wml | 44 +++ 1 file changed, 44 insertions(+) diff --git a/donate/en/donate-amazon.wml b/donate/en/donate-amazon.wml new file mode 100644 index 000..2c2bf95 --- /dev/null +++ b/donate/en/donate-amazon.wml @@ -0,0 +1,44 @@ +## translation metadata +# Revision: $Revision$ +# Translation-Priority: 3-low + +#include "head.wmi" TITLE="Tor Project: Donate to Tor" CHARSET="UTF-8" + + +Home » +Donate + + + +https://static-na.payments-amazon.com/OffAmazonPayments/us/sandbox/js/Widgets.js";> +https://www.torproject.org"; +data-ap-currency-code="USD" +data-ap-amount="0" +data-ap-note="" +data-ap-shipping-address-required="false" +data-ap-payment-action="None" +> + + + + + + +#include "side-donate.wmi" +#include "info.wmi" + + + + +#include ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/master] Update amazon button
commit 172fab932427ebd028e83eca6e999073c172b25e Author: Sebastian Hahn Date: Fri Nov 13 04:07:02 2015 +0100 Update amazon button --- donate/en/donate-amazon.wml | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/donate/en/donate-amazon.wml b/donate/en/donate-amazon.wml index bcb96f4..0d4799f 100644 --- a/donate/en/donate-amazon.wml +++ b/donate/en/donate-amazon.wml @@ -17,7 +17,7 @@ src="https://static-na.payments-amazon.com/OffAmazonPayments/us/js/Widgets.js";>< data-ap-widget-theme="ap-light" data-ap-widget-amount-presets="5,25,50,100" data-ap-widget-default-amount="1" -data-ap-signature="TccqAE9jXn74b3xQgYc5rFG9Y9N3Rbq3ihSQQfF0plg%3D" +data-ap-signature="%2B6UiARhqtXOPGLHP%2F6DrD3zH68ZHxmA9tBLjfjJ3jYU%3D" data-ap-seller-id="A3KD3XX49657E7" data-ap-access-key="AKIAISELZYVMUQ7F5M7Q" @@ -26,9 +26,9 @@ data-ap-lwa-client-id="amzn1.application-oa2-client.b0b3efe8eb6841ed800ff2cc45b1 data-ap-currency-code="USD" data-ap-amount="0" data-ap-note="Thank you for your donation to The Tor Project. The -Tor Project is a 501c3 organization, and our federal tax ID number is 20 -8096820. Your gift is tax deductible in the United States as allowed by -law. The Tor Project respects the confidentiality of its supporters, +Tor Project is a 501c3 organization, and our federal tax ID number is +20-8096820. Your gift is tax deductible in the United States as allowed +by law. The Tor Project respects the confidentiality of its supporters, and we do not lend, rent, or sell our lists of donors at any time. Your donation enables Tor developers to focus on making Tor better, including scalability, user support and better documentation, usability and @@ -37,7 +37,7 @@ like to keep in touch or get more involved, please visit us at www.torproject.org. Our mission is to advance human rights and freedoms by creating and deploying free and open anonymity and privacy technologies, supporting their unrestricted availability and use, and -furthering their scientific and popular understanding." +furthering their scientific and popular understanding. " data-ap-shipping-address-required="false" data-ap-payment-action="AuthorizeAndCapture" > ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/staging] Adding swag page, update tshirt page and small changes to the other pages.
commit 86e6088dfddb7c7ef6c41ee79c5c124603e88869 Author: toya Date: Mon Nov 23 22:35:18 2015 -0800 Adding swag page, update tshirt page and small changes to the other pages. --- donate/en/campaign-swag.wml| 84 donate/en/donate.wml |8 ++-- donate/en/donor-faq.wml| 13 -- donate/en/donor-privacy-policy.wml |4 +- getinvolved/en/tshirt.wml |3 +- images/campaign-hoody.jpg | Bin 0 -> 55689 bytes images/campaign-t-shirt-1.jpg | Bin 0 -> 44107 bytes images/campaign-t-shirt-2.jpg | Bin 0 -> 50638 bytes images/sticker-pack.jpg| Bin 0 -> 42540 bytes 9 files changed, 100 insertions(+), 12 deletions(-) diff --git a/donate/en/campaign-swag.wml b/donate/en/campaign-swag.wml new file mode 100644 index 000..43969e9 --- /dev/null +++ b/donate/en/campaign-swag.wml @@ -0,0 +1,84 @@ +## translation metadata +# Revision: $Revision$ +# Translation-Priority: 3-low + +#include "donatehead.wmi" TITLE="Donate to keep Tor alive!" CHARSET="UTF-8" + + + + + Back to donate page! + + + Thank you for your donation! + + + + $23+ donation is eligible for a sticker pack. + You will receive an assortment of Tor stickers plus our exclusive "Tor Supporter" sticker. Display with pride! :) + + + + $100+ donation is eligible for 1 t-shirt. Select your style and size. + Both T-shirts are: + + 100% pre-shrunk organic cotton + Water-based silk screen print + Made fairly + Certification: GOTS + + + + + + + + T-Shirt Design Option #1 + (Limited Edition and exclusive to this campaign!) + THIS IS WHAT A TOR SUPPORTER LOOKS LIKE + Color: Black + Sizes available: + Men S, M, L, XL, XXL + Women S, M, L + + + + T-Shirt Design Option #2 + ROOTS + Color: Black + Sizes available: + Men S, M, L, XL, XXL + Women S, M, L + + + + $500+ donation is eligible for 1 hooded sweatshirt. + Hooded sweatshirts are: + + 100% pre-shrunk organic cotton + Water-based silk screen print + Made fairly + Certification: GOTS + + + + + Select your size. + Hoodie Design #1 (Limited Edition!) + ROOTS + Color: Black + Sizes available: + Men S, M, L, XL, XXL + W
[tor-commits] [webwml/staging] first commit
commit 6c738818f98fc4e78afdb31f3de9b218be72e74e
Author: toya
Date: Mon Nov 23 09:57:39 2015 -0800
first commit
---
README.md |1 +
css/bootstrap.css |1 -
donate/en/donate.wml | 10 +-
donate/en/donor-faq.wml| 189 +++-
donate/en/donor-privacy-policy.wml | 24 ++---
5 files changed, 186 insertions(+), 39 deletions(-)
diff --git a/README.md b/README.md
index 974188d..fda3cb4 100644
--- a/README.md
+++ b/README.md
@@ -118,3 +118,4 @@ packages in dist/ less awful -- automatically check that
they have
signatures and that the sigs match, that the items on the website are in
fact in dist, only allow certain people to put files in certain places,
etc. One day! :)
+# tp_donation
diff --git a/css/bootstrap.css b/css/bootstrap.css
index a5f2a34..90512be 100755
--- a/css/bootstrap.css
+++ b/css/bootstrap.css
@@ -1482,7 +1482,6 @@ abbr[data-original-title] {
}
blockquote {
padding: 10px 20px;
- margin: 0 0 20px;
font-size: 17.5px;
border-left: 5px solid #ee;
}
diff --git a/donate/en/donate.wml b/donate/en/donate.wml
index 18d5fe2..86be294 100644
--- a/donate/en/donate.wml
+++ b/donate/en/donate.wml
@@ -8,12 +8,13 @@
-
+
This is what a Tor supporter looks like:
+
-
+
Laura Poitras
"Edward Snowden would not
have been able to contact me without Tor and other free software encryption
projects. Journalists need Tor to protect their sources and to research freely.
It is an essential tool, and it needs our support."
@@ -30,14 +31,13 @@
10
100
256
- 23
+ 50
500
1
$
-
-.00
+
diff --git a/donate/en/donor-faq.wml b/donate/en/donor-faq.wml
index 55b3412..950cd76 100644
--- a/donate/en/donor-faq.wml
+++ b/donate/en/donor-faq.wml
@@ -5,48 +5,193 @@
#include "donatehead.wmi" TITLE="Donate to keep Tor alive!" CHARSET="UTF-8"
-
- Support Tor!
+
+
+ Back to donate page!
+
Donor FAQ
-
+
+
+What is the Tor Project and what does it
do?
+The Tor Project’s mission is to advance human rights and
freedoms by creating and deploying free and open anonymity and privacy
technologies, supporting their unrestricted availability and use, and
furthering their scientific and popular understanding. The main product of the
Tor Project is the Tor Browser, which enables people to browse the internet
anonymously. The Tor Project is a 501(c)3 tax-exempt non-profit organization
based in Boston, Massachusetts. It was founded in 2006.
+
+
+Who works for the Tor Project, and what do they
do?
+Thousands of people around the world actively support the work
of the Tor Project, including developers, designers, relay operators,
researchers, cryptographers, computer scientists, and privacy advocates. Most
are not paid by the Tor Project; even our very small staff includes many
volunteers. You can read about the core contributors to the Tor Project on our
https://www.torproject.org/about/corepeople.html.en";
target="_blank">Core People page.
+
+
+Who uses Tor?
+The vast majority of Tor users are ordinary people who want
control of their privacy online or people whose internet use is censored. Other
Tor users are journalists, human rights defenders, domestic violence survivors,
policymakers, diplomats, and academic and research institutions.
+
+
+Can anyone use Tor?
+Yes! Tor is free, and anyone can use it. To get started, you
will need to https://www.torproject.org/projects/torbrowser.html.en";
target="_blank">download the Tor browser. We offer instructions on how to
download for https://www.torproject.org/projects/torbrowser.html.en#windows";
target="_blank">Windows, https://www.torproject.org/projects/torbrowser.html.en#macosx";
target="_blank">Mac OS X and https://www.torproject.org/projects/torbrowser.html.en#linux";
target="_blank">Linux.
+
-Lorem ipsum dolor sit amet, nibh scelerisque adipiscing
facilisis, ut turpis aenean quam?
-Lorem ipsum dolor sit amet, turpis ipsum rhoncus odio, pharetra
egestas sapien pulvinar, donec cursus in dictum curabitur. Erat dolor massa
nonummy nulla, quasi lorem ipsum integer
[tor-commits] [webwml/staging] Merge remote-tracking branch 'isa/donation-updates' into staging
commit 5375b1adecac9fef1dd88a18e2257d6463d5ffa7 Merge: 19167d5 6c73881 Author: Mike Perry Date: Mon Nov 23 10:52:21 2015 -0800 Merge remote-tracking branch 'isa/donation-updates' into staging README.md |1 + css/bootstrap.css |1 - donate/en/donate.wml | 10 +- donate/en/donor-faq.wml| 189 +++- donate/en/donor-privacy-policy.wml | 24 ++--- 5 files changed, 186 insertions(+), 39 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/staging] Fix paypal glitch.
commit 19167d525198145049b08af0f62b7c3d91d1d837
Author: Mike Perry
Date: Sun Nov 22 19:28:39 2015 -0800
Fix paypal glitch.
---
donate/en/donate.wml |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/donate/en/donate.wml b/donate/en/donate.wml
index 18d5fe2..865e90c 100644
--- a/donate/en/donate.wml
+++ b/donate/en/donate.wml
@@ -97,7 +97,7 @@ function displayVals() {
jQuery(function(){
jQuery("button[name='amnt']").click(displayVals);
- jQuery("input[name='cmd']").click(displayVals);
+ //jQuery("input[name='cmd']").click(displayVals);
jQuery("#exampleInputAmount").click(displayVals);
jQuery("#exampleInputAmount").change(displayVals);
displayVals();
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/staging] Donate page: Fix the radio button toggle amount glitch.
commit f59d43d479637a6c722e4b0a276fdde5ee3b946c
Author: Mike Perry
Date: Sun Nov 22 18:33:04 2015 -0800
Donate page: Fix the radio button toggle amount glitch.
---
donate/en/donate.wml |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/donate/en/donate.wml b/donate/en/donate.wml
index 2b8a0b9..18d5fe2 100644
--- a/donate/en/donate.wml
+++ b/donate/en/donate.wml
@@ -36,7 +36,7 @@
1
$
-
+
.00
@@ -82,7 +82,7 @@ function displayVals() {
amount = $( this ).filter("input").val();
if (amount == null) {
amount = 100;
-} else {
+} else if (this.id == "exampleInputAmount") {
$( "button" ).removeClass('active');
$( this ).addClass('active');
}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/master] Fix mac TBB alpha links.
commit 112861201013acb781eed34b7538f0f84571a3a3 Author: Mike Perry Date: Wed Nov 4 06:33:38 2015 -0800 Fix mac TBB alpha links. --- projects/en/torbrowser.wml |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/en/torbrowser.wml b/projects/en/torbrowser.wml index 239c46f..0f8d694 100644 --- a/projects/en/torbrowser.wml +++ b/projects/en/torbrowser.wml @@ -409,9 +409,9 @@ 32/64-bit (sig) 64-bit + href="../dist/torbrowser//TorBrowser--osx64_ja.dmg">64-bit (sig) + href="../dist/torbrowser//TorBrowser--osx64_ja.dmg.asc">sig) 32-bit (sig) • 64-bit ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/master] Bump TBB version to list 5.0.4 and 5.5a4.
commit fe194ff0201348dd1fd9c9807666c3050acd0f89 Author: Mike Perry Date: Tue Nov 3 15:32:07 2015 -0800 Bump TBB version to list 5.0.4 and 5.5a4. --- include/versions.wmi | 22 +++--- projects/torbrowser/RecommendedTBBVersions | 10 +- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index 76cb6d1..7a22419 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -18,11 +18,11 @@ 0.2.3.25 0.2.4.17-rc -5.0.3 -5.5a3 +5.0.4 +5.5a4 -5.0.3 -5.5a3 +5.0.4 +5.5a4 0.2.4.19 libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.1e 24.2.0esr @@ -31,18 +31,18 @@ 3.2 1.3.21 -5.0.3 -5.0.3 -5.5a3 -5.5a3 +5.0.4 +5.0.4 +5.5a4 +5.5a4 0.2.4.19 libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.0k 24.2.0esr 1.5.2 -5.0.3 -5.0.3 -5.5a3 +5.0.4 +5.0.4 +5.5a4 0.2.4.19 24.2.0esr 1.5.2 diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index 0ad46cb..13bd09d 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -6,5 +6,13 @@ "5.5a3", "5.5a3-Linux", "5.5a3-MacOS", -"5.5a3-Windows" +"5.5a3-Windows", +"5.0.4", +"5.0.4-Linux", +"5.0.4-MacOS", +"5.0.4-Windows", +"5.5a4", +"5.5a4-Linux", +"5.5a4-MacOS", +"5.5a4-Windows" ] ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-bundle/maint-5.0] Bump gitian tag due to key expiration.
commit ca0f563c6da3a6ce496b034eb432e86289e05d9c Author: Mike Perry Date: Thu Sep 17 16:26:42 2015 -0700 Bump gitian tag due to key expiration. --- gitian/versions |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions b/gitian/versions index f2d59d5..24f26ae 100755 --- a/gitian/versions +++ b/gitian/versions @@ -33,7 +33,7 @@ GO_X_CRYPTO_TAG=4ed45ec682102c643324fae5dff8dab085b6c300 GO_X_NET_TAG=7dbad50ab5b31073856416cdcfeb2796d682f844 OBFS4_TAG=obfs4proxy-0.0.5 -GITIAN_TAG=tor-browser-builder-3.x-8 +GITIAN_TAG=tor-browser-builder-3.x-8-gpgsux OPENSSL_VER=1.0.1p GMP_VER=5.1.3 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-bundle/maint-5.0] Update keys for mikeperry.
commit 496972c5deda6cc34124047552777d95498b7edb Author: Mike Perry Date: Thu Sep 17 16:12:08 2015 -0700 Update keys for mikeperry. --- gitian/gpg/mikeperry.gpg | Bin 15716 -> 21696 bytes gitian/gpg/torbrowser.gpg | Bin 18844 -> 18952 bytes gitian/gpg/torbutton.gpg | Bin 49582 -> 55562 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/mikeperry.gpg b/gitian/gpg/mikeperry.gpg index 7f14ee3..8615796 100644 Binary files a/gitian/gpg/mikeperry.gpg and b/gitian/gpg/mikeperry.gpg differ diff --git a/gitian/gpg/torbrowser.gpg b/gitian/gpg/torbrowser.gpg index dc44e33..d1033d4 100644 Binary files a/gitian/gpg/torbrowser.gpg and b/gitian/gpg/torbrowser.gpg differ diff --git a/gitian/gpg/torbutton.gpg b/gitian/gpg/torbutton.gpg index b60a95e..e4a03dd 100644 Binary files a/gitian/gpg/torbutton.gpg and b/gitian/gpg/torbutton.gpg differ ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-bundle/maint-5.0] Bump browser to build 2.
commit f182615a6825601ad0ddb6879eabff64db49754d
Author: Mike Perry
Date: Thu Sep 17 14:28:33 2015 -0700
Bump browser to build 2.
Also clean up changelog a bit.
---
Bundle-Data/Docs/ChangeLog.txt |9 +
gitian/versions|2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index 095968f..ade00f3 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -7,18 +7,19 @@ Tor Browser 5.0.3 -- September 22 2015
* Bug 16797: brandShorterName is missing from brand.properties
* Bug 14429: Make sure the automatic resizing is disabled
* Translation updates
- * Bug 7446: Torbutton should not fix up .onion domains
+ * Bug 7446: Tor Browser should not "fix up" .onion domains (or any domains)
* Bug 16837: Disable Firefox Hotfix updates
- * Bug 16855: Allow blobs to be download on first-party pages
+ * Bug 16855: Allow blobs to be download on first-party pages (fixes mega.nz)
* Bug 16781: Allow saving pdf files in built-in pdf viewer
* Bug 16842: Restore Media tab on Page information dialog
* Bug 16727: Disable about:healthreport page
* Bug 16783: Normalize NoScript default whitelist
- * Bug 16775: Fix preferences dialog with slider set to "High"
+ * Bug 16775: Fix preferences dialog with security slider set to "High"
* Bug 13579: Update download progress bar automatically
- * Bug 15646: Prevent keyboard layout fingerprinting in KeyboardEvent
+ * Bug 15646: Reduce keyboard layout fingerprinting in KeyboardEvent
* Bug 17046: Event.timeStamp should not reveal startup time
* Bug 16872: Fix warnings when opening about:downloads
+ * Bug 17097: Fix intermittent crashes when using the print dialog
* Windows
* Bug 16906: Fix Mingw-w64 compilation breakage
* OS X
diff --git a/gitian/versions b/gitian/versions
index deecc7f..f2d59d5 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -8,7 +8,7 @@ FIREFOX_VERSION=38.3.0esr
TORBROWSER_UPDATE_CHANNEL=release
-TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-2-build1
+TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-2-build2
TOR_TAG=tor-0.2.6.10
TORLAUNCHER_TAG=0.2.7.7
TORBUTTON_TAG=1.9.3.4
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-38.3.0esr-5.5-1] fixup! Bug #5742: API allows you to get the url bar URI for a channel or nsIDocument.
commit baca89fcad30603ccac4a2fe1f51ab3f0d0b8518
Author: Arthur Edelstein
Date: Thu Sep 17 12:46:45 2015 -0700
fixup! Bug #5742: API allows you to get the url bar URI for a channel or
nsIDocument.
---
dom/base/ThirdPartyUtil.cpp | 18 +++---
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/dom/base/ThirdPartyUtil.cpp b/dom/base/ThirdPartyUtil.cpp
index e8ec06c..6f0a358 100644
--- a/dom/base/ThirdPartyUtil.cpp
+++ b/dom/base/ThirdPartyUtil.cpp
@@ -648,13 +648,17 @@ ThirdPartyUtil::GetFirstPartyURIInternal(nsIChannel
*aChannel,
if (aDoc->GetWindow()) {
aDoc->GetWindow()->GetTop(getter_AddRefs(top));
- top->GetDocument(getter_AddRefs(topDDoc));
-
- nsCOMPtr topDoc(do_QueryInterface(topDDoc));
- docURI = topDoc->GetOriginalURI();
- if (docURI) {
-// Give us a mutable URI and also addref
-rv = NS_EnsureSafeToReturn(docURI, aOutput);
+ if (top) {
+top->GetDocument(getter_AddRefs(topDDoc));
+
+nsCOMPtr topDoc(do_QueryInterface(topDDoc));
+if (topDoc) {
+ docURI = topDoc->GetOriginalURI();
+ if (docURI) {
+// Give us a mutable URI and also addref
+rv = NS_EnsureSafeToReturn(docURI, aOutput);
+ }
+}
}
} else {
// XXX: Chrome callers (such as NoScript) can end up here
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-38.3.0esr-5.0-2] fixup! Bug #5742: API allows you to get the url bar URI for a channel or nsIDocument.
commit bf0222961ed34874922c51ba1948439839f8d715
Author: Arthur Edelstein
Date: Thu Sep 17 12:46:45 2015 -0700
fixup! Bug #5742: API allows you to get the url bar URI for a channel or
nsIDocument.
---
dom/base/ThirdPartyUtil.cpp | 18 +++---
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/dom/base/ThirdPartyUtil.cpp b/dom/base/ThirdPartyUtil.cpp
index e8ec06c..6f0a358 100644
--- a/dom/base/ThirdPartyUtil.cpp
+++ b/dom/base/ThirdPartyUtil.cpp
@@ -648,13 +648,17 @@ ThirdPartyUtil::GetFirstPartyURIInternal(nsIChannel
*aChannel,
if (aDoc->GetWindow()) {
aDoc->GetWindow()->GetTop(getter_AddRefs(top));
- top->GetDocument(getter_AddRefs(topDDoc));
-
- nsCOMPtr topDoc(do_QueryInterface(topDDoc));
- docURI = topDoc->GetOriginalURI();
- if (docURI) {
-// Give us a mutable URI and also addref
-rv = NS_EnsureSafeToReturn(docURI, aOutput);
+ if (top) {
+top->GetDocument(getter_AddRefs(topDDoc));
+
+nsCOMPtr topDoc(do_QueryInterface(topDDoc));
+if (topDoc) {
+ docURI = topDoc->GetOriginalURI();
+ if (docURI) {
+// Give us a mutable URI and also addref
+rv = NS_EnsureSafeToReturn(docURI, aOutput);
+ }
+}
}
} else {
// XXX: Chrome callers (such as NoScript) can end up here
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-38.2.1esr-5.0-2] Bug #16855: Allow blobs to be downloaded on first-party pages
commit d23a2ee2fb629b410131e6ef778066316d51bb62
Author: Arthur Edelstein
Date: Tue Sep 15 12:40:18 2015 -0700
Bug #16855: Allow blobs to be downloaded on first-party pages
This patch may be made obsolete by Tanvi's work:
https://bugzilla.mozilla.org/show_bug.cgi?id=1198559#c15
---
docshell/base/nsDocShell.cpp |9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index 317f072..03885534 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -10538,9 +10538,14 @@ nsDocShell::DoURILoad(nsIURI* aURI,
nsCOMPtr requestingNode;
if (mScriptGlobal) {
-requestingNode = mScriptGlobal->GetFrameElementInternal();
-if (!requestingNode) {
+if (!aFileName.IsVoid()) {
+ // File is being downloaded. Assign current document to requesting node.
requestingNode = mScriptGlobal->GetExtantDoc();
+} else {
+ requestingNode = mScriptGlobal->GetFrameElementInternal();
+ if (!requestingNode) {
+requestingNode = mScriptGlobal->GetExtantDoc();
+ }
}
}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-38.3.0esr-5.5-1] Bug 16906: Fix MinGW compilation breakage.
commit 08a3456fd48830b760a6fa6a0cbee3115f0c22cc Author: Mike Perry Date: Wed Sep 16 23:12:34 2015 -0700 Bug 16906: Fix MinGW compilation breakage. Patch from https://hg.mozilla.org/mozilla-central/rev/34bbc3cb3e79 https://bugzilla.mozilla.org/show_bug.cgi?id=1199118 --- toolkit/mozapps/update/common/certificatecheck.cpp |3 --- toolkit/mozapps/update/common/sources.mozbuild |4 toolkit/mozapps/update/tests/moz.build |1 - 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/toolkit/mozapps/update/common/certificatecheck.cpp b/toolkit/mozapps/update/common/certificatecheck.cpp index 16a1dd4..f132f2b 100644 --- a/toolkit/mozapps/update/common/certificatecheck.cpp +++ b/toolkit/mozapps/update/common/certificatecheck.cpp @@ -11,9 +11,6 @@ #include "certificatecheck.h" #include "updatelogging.h" -#pragma comment(lib, "wintrust.lib") -#pragma comment(lib, "crypt32.lib") - static const int ENCODING = X509_ASN_ENCODING | PKCS_7_ASN_ENCODING; /** diff --git a/toolkit/mozapps/update/common/sources.mozbuild b/toolkit/mozapps/update/common/sources.mozbuild index 727786f..7ec1aff 100644 --- a/toolkit/mozapps/update/common/sources.mozbuild +++ b/toolkit/mozapps/update/common/sources.mozbuild @@ -12,6 +12,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': 'uachelper.cpp', 'updatehelper.cpp', ] +OS_LIBS += [ +'crypt32', +'wintrust', +] sources += [ 'readstrings.cpp', diff --git a/toolkit/mozapps/update/tests/moz.build b/toolkit/mozapps/update/tests/moz.build index 9081e5b..65d250c 100644 --- a/toolkit/mozapps/update/tests/moz.build +++ b/toolkit/mozapps/update/tests/moz.build @@ -36,7 +36,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android': if CONFIG['OS_ARCH'] == 'WINNT': OS_LIBS += [ -'wintrust', 'shlwapi', ] ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [torbutton/master] Merge remote-tracking branch 'brade/bug16735-01'
commit 1d53083cda57bac8c1d8b8feb805dc7cac9d557d Merge: fc91b51 08728b3 Author: Mike Perry Date: Tue Sep 15 21:05:06 2015 -0700 Merge remote-tracking branch 'brade/bug16735-01' src/chrome/content/aboutTor/aboutTor.xhtml | 205 .../content/aboutTor/onionArrow-extension.png | Bin 1695 -> 1798 bytes .../content/aboutTor/onionArrow-leftBend.png | Bin 0 -> 2080 bytes src/chrome/content/aboutTor/onionArrow-right.png | Bin 2503 -> 0 bytes .../content/aboutTor/onionArrow-rightBend.png | Bin 0 -> 2077 bytes src/chrome/content/aboutTor/onionArrow.png | Bin 2381 -> 0 bytes src/chrome/skin/aboutTor.css | 68 +++ 7 files changed, 157 insertions(+), 116 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [torbutton/master] Bug 16735: about:tor should accommodate different fonts/font sizes.
commit 08728b3bfac14fe5a325fe94cc9e7d6fe106b559
Author: Kathy Brade
Date: Mon Sep 14 11:37:14 2015 -0400
Bug 16735: about:tor should accommodate different fonts/font sizes.
Avoid hard-coded heights and positions in about:tor. The "update needed"
arrow is now constructed from 4 elements instead of 2 and the info.
"bubbles" use table layout instead of hard-coded heights.
Set the CSS z-index so that text will be in front of the status image
(onion image) and the "update needed" arrow.
Use "let" instead of "var" in the about:tor JS code.
---
src/chrome/content/aboutTor/aboutTor.xhtml | 205
.../content/aboutTor/onionArrow-extension.png | Bin 1695 -> 1798 bytes
.../content/aboutTor/onionArrow-leftBend.png | Bin 0 -> 2080 bytes
src/chrome/content/aboutTor/onionArrow-right.png | Bin 2503 -> 0 bytes
.../content/aboutTor/onionArrow-rightBend.png | Bin 0 -> 2077 bytes
src/chrome/content/aboutTor/onionArrow.png | Bin 2381 -> 0 bytes
src/chrome/skin/aboutTor.css | 68 +++
7 files changed, 157 insertions(+), 116 deletions(-)
diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml
b/src/chrome/content/aboutTor/aboutTor.xhtml
index 95807fd..0991ebe 100644
--- a/src/chrome/content/aboutTor/aboutTor.xhtml
+++ b/src/chrome/content/aboutTor/aboutTor.xhtml
@@ -1,6 +1,6 @@
@@ -38,86 +38,122 @@ function onLoad()
function adjustToolbarIconArrow()
{
- var textElem = document.getElementById("updatePrompt");
- var arrowDiv = document.getElementById("toolbarIconArrow");
- var extDiv = document.getElementById("toolbarIconArrowExtension");
- if (textElem && arrowDiv && extDiv)
+ let textElem = document.getElementById("updatePrompt");
+ let arrowHeadDiv = document.getElementById("toolbarIconArrowHead");
+ let vertExtDiv = document.getElementById("toolbarIconArrowVertExtension");
+ let bendDiv = document.getElementById("toolbarIconArrowBend");
+ let horzExtDiv = document.getElementById("toolbarIconArrowHorzExtension");
+ if (!textElem || !arrowHeadDiv || !vertExtDiv || !bendDiv || !horzExtDiv)
+return;
+
+ let arrowTailElems = [ vertExtDiv, bendDiv, horzExtDiv ];
+ let tbXpos;
+ if (document.body.hasAttribute("torbutton-xpos"))
+tbXpos = parseInt(document.body.getAttribute("torbutton-xpos"), 10);
+
+ if (!tbXpos || isNaN(tbXpos) || (tbXpos < 0))
{
-var tbXpos;
-if (document.body.hasAttribute("torbutton-xpos"))
- tbXpos = parseInt(document.body.getAttribute("torbutton-xpos"), 10);
-
-if (!tbXpos || isNaN(tbXpos) || (tbXpos < 0))
-{
- arrowDiv.style.display = "none";
- extDiv.style.display = "none";
- return;
-}
+arrowHeadDiv.style.display = "none";
+for (let elem of arrowTailElems)
+ elem.style.display = "none";
+return;
+ }
-// Account for content zoom and retina displays by converting to device
-// independent units.
-if ("devicePixelRatio" in window) // FF18+
- tbXpos /= window.devicePixelRatio;
-
-const kArrowMargin = 6;
-arrowDiv.style.display = "block"; // Must be visible to get offsetWidth.
-var arrowHalfWidth = arrowDiv.offsetWidth / 2.0;
-var leftAnchor = textElem.offsetLeft - kArrowMargin - arrowHalfWidth;
-var rightAnchor = textElem.offsetLeft + textElem.offsetWidth
- + kArrowMargin + arrowHalfWidth;
-
-var arrowDisplay = "block";
-var extDisplay = "block";
-if (tbXpos < leftAnchor)
-{
- // Toolbar button to left of text.
- arrowDiv.setAttribute("pos", "left");
- arrowDiv.style.left = (tbXpos - arrowHalfWidth) + "px";
- var extLeft = tbXpos + arrowHalfWidth;
- extDiv.style.left = extLeft + "px";
- extDiv.style.width = (textElem.offsetLeft - extLeft - kArrowMargin) +
"px";
-}
-else if ((tbXpos > rightAnchor) &&
- (tbXpos < (window.innerWidth - arrowHalfWidth)))
-{
- // Toolbar button to right of text.
- arrowDiv.setAttribute("pos", "right");
- arrowDiv.style.left = (tbXpos - arrowHalfWidth) + "px";
- var extLeft = rightAnchor - arrowHalfWidth;
- extDiv.style.left = extLeft + "px";
- extDiv.style.width = (tbXpos - arrowHalfWidth - extLeft) + "px";
-}
-else if ((tbXpos >= leftAnchor) && (tbXpos <= rightAnchor))
-{
- // Toolbar button in middle about text; use arrow without a tail.
- arrowDiv.setAttribute("pos", "middle");
- arrowDiv.style.left = (tbXpos - arrowHalfWidth) + "px";
- extDisplay = "none";
-}
-else // Unable to display arrow (e.g., toolbar button is above sidebar).
+ // Account for content zoom and retina displays by converting to device
+ // independent units.
+ if ("devicePixelRatio" in window) // FF18+
+tbXpos /= window.devicePixelRatio;
+
+ const kArrowMargin = 6; // Horizontal margin between line and text.
+ const kArrowHeadExtraWidth = 9; // Horizontal margin to the
[tor-commits] [tor-browser-bundle/master] Merge remote-tracking branch 'brade/bug16937-01'
commit 1288790242194bbd7b98d16dbe815c25703eac3d Merge: 41adead 2029ea7 Author: Mike Perry Date: Tue Sep 15 20:54:16 2015 -0700 Merge remote-tracking branch 'brade/bug16937-01' gitian/descriptors/linux/gitian-bundle.yml |4 +++- gitian/descriptors/mac/gitian-bundle.yml |5 +++-- gitian/descriptors/windows/gitian-bundle.yml |4 +++- 3 files changed, 9 insertions(+), 4 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-bundle/master] Bug 16937: homepage pref has been translated in the Korean bundle
commit 2029ea7002c4704c9965674c97ed9ea379c97765 Author: Kathy Brade Date: Tue Sep 15 13:43:20 2015 -0400 Bug 16937: homepage pref has been translated in the Korean bundle Remove the en-US spellchecking dictionary from non en-US packages. --- gitian/descriptors/linux/gitian-bundle.yml |4 +++- gitian/descriptors/mac/gitian-bundle.yml |5 +++-- gitian/descriptors/windows/gitian-bundle.yml |4 +++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index a8f8d51..81fcdf1 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -205,10 +205,12 @@ script: | rm -rf defaults popd -# Set the update.locale (it is used to replace %LOCALE% within app.update.url). +# Set the update.locale (it is used to replace %LOCALE% within +# app.update.url) and remove the en-US spellchecking dictionary. pushd tor-browser_$LANG/Browser/ echo "$LANG" > update.locale zip -Xm omni.ja update.locale +rm -rf dictionaries popd # Recreate precomplete file (needs to be accurate for full MAR updates). diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index bd54f0d..cfb7888 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -231,11 +231,12 @@ script: | popd # Set the update.locale (it is used to replace %LOCALE% within -# app.update.url) and recreate the precomplete file (needs to be accurate -# for full MAR updates). +# app.update.url), remove the en-US spellchecking dictionary, and recreate +# the precomplete file (needs to be accurate for full MAR updates). pushd ~/build/dmg/$DEST.app/Contents/Resources/ echo "$LANG" > update.locale zip -Xm omni.ja update.locale +rm -rf dictionaries rm -f precomplete python $MARTOOLS/createprecomplete.py popd diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index b821528..dc8ad05 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -192,10 +192,12 @@ script: | rm -rf defaults popd -# Set the update.locale (it is used to replace %LOCALE% within app.update.url). +# Set the update.locale (it is used to replace %LOCALE% within +# app.update.url) and remove the en-US spellchecking dictionary. pushd "Tor Browser"/Browser/ echo "$LANG" > update.locale zip -Xm omni.ja update.locale +rm -rf dictionaries popd # Recreate precomplete file (needs to be accurate for full MAR updates). ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [torbutton/master] Bug 16937: homepage pref has been translated in the Korean bundle
commit fc91b515a6e0d9e5455d39e52abf2c1352e20f3c Author: Kathy Brade Date: Mon Sep 14 15:28:31 2015 -0400 Bug 16937: homepage pref has been translated in the Korean bundle To keep the browser.startup.homepage pref value out of translators hands, all of the localized browser.properties files have been removed and the pref value (about:tor) has been moved to a new non-localized.properties file. We no longer provide a value for spellchecker.dictionary, which means non en-US users will probably need to set their spellchecking language from the browser context menu or via about:config after they install a dictionary for their language. The browser will also consult the LANG environment variable and use a "default default" of en-US if an en-US dictionary is installed. --- src/chrome/content/locale/non-localized.properties |6 ++ src/chrome/locale/af/browser.properties| 13 - src/chrome/locale/ak/browser.properties| 13 - src/chrome/locale/am/browser.properties| 13 - src/chrome/locale/ar/browser.properties|5 - src/chrome/locale/arn/browser.properties | 13 - src/chrome/locale/ast/browser.properties | 13 - src/chrome/locale/az/browser.properties| 13 - src/chrome/locale/be/browser.properties| 13 - src/chrome/locale/bg/browser.properties| 13 - src/chrome/locale/bn-IN/browser.properties | 13 - src/chrome/locale/bn/browser.properties| 13 - src/chrome/locale/bo/browser.properties| 13 - src/chrome/locale/br/browser.properties| 13 - src/chrome/locale/bs/browser.properties| 13 - src/chrome/locale/ca/browser.properties| 13 - src/chrome/locale/cs/browser.properties| 13 - src/chrome/locale/csb/browser.properties | 13 - src/chrome/locale/cy/browser.properties| 13 - src/chrome/locale/da/browser.properties| 13 - src/chrome/locale/de/browser.properties|5 - src/chrome/locale/dz/browser.properties| 13 - src/chrome/locale/el/browser.properties| 13 - src/chrome/locale/en/browser.properties|5 - src/chrome/locale/eo/browser.properties| 13 - src/chrome/locale/es/browser.properties|5 - src/chrome/locale/et/browser.properties| 13 - src/chrome/locale/eu/browser.properties|5 - src/chrome/locale/fa/browser.properties|5 - src/chrome/locale/fi/browser.properties| 13 - src/chrome/locale/fil/browser.properties | 13 - src/chrome/locale/fo/browser.properties| 13 - src/chrome/locale/fr/browser.properties|5 - src/chrome/locale/fur/browser.properties | 13 - src/chrome/locale/fy/browser.properties| 13 - src/chrome/locale/ga/browser.properties| 13 - src/chrome/locale/gl/browser.properties| 13 - src/chrome/locale/gu/browser.properties| 13 - src/chrome/locale/gun/browser.properties | 13 - src/chrome/locale/ha/browser.properties| 13 - src/chrome/locale/he/browser.properties| 13 - src/chrome/locale/hi/browser.properties| 13 - src/chrome/locale/hr/browser.properties| 13 - src/chrome/locale/ht/browser.properties| 13 - src/chrome/locale/hu/browser.properties| 13 - src/chrome/locale/hy/browser.properties| 13 - src/chrome/locale/id/browser.properties| 13 - src/chrome/locale/is/browser.properties| 13 - src/chrome/locale/it/browser.properties|5 - src/chrome/locale/ja/browser.properties|5 - src/chrome/locale/jv/browser.properties| 13 - src/chrome/locale/ka/browser.properties| 13 - src/chrome/locale/km/browser.properties| 13 - src/chrome/locale/kn/browser.properties| 13 - src/chrome/locale/ko/browser.properties|5 - src/chrome/locale/ku/browser.properties| 13 - src/chrome/locale/kw/browser.properties| 13 - src/chrome/locale/ky/browser.properties| 13 - src/chrome/locale
[tor-commits] [tor-browser/tor-browser-38.2.1esr-5.5-2] Bug #16855: Allow blobs to be downloaded on first-party pages
commit 3fad66704cdf3a731b776aef0972ba46eb4c31b3
Author: Arthur Edelstein
Date: Tue Sep 15 12:40:18 2015 -0700
Bug #16855: Allow blobs to be downloaded on first-party pages
This patch may be made obsolete by Tanvi's work:
https://bugzilla.mozilla.org/show_bug.cgi?id=1198559#c15
---
docshell/base/nsDocShell.cpp |9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index 317f072..03885534 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -10538,9 +10538,14 @@ nsDocShell::DoURILoad(nsIURI* aURI,
nsCOMPtr requestingNode;
if (mScriptGlobal) {
-requestingNode = mScriptGlobal->GetFrameElementInternal();
-if (!requestingNode) {
+if (!aFileName.IsVoid()) {
+ // File is being downloaded. Assign current document to requesting node.
requestingNode = mScriptGlobal->GetExtantDoc();
+} else {
+ requestingNode = mScriptGlobal->GetFrameElementInternal();
+ if (!requestingNode) {
+requestingNode = mScriptGlobal->GetExtantDoc();
+ }
}
}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-38.2.1esr-5.5-2] Merge remote-tracking branch 'arthur/16855' into tor-browser-38.2.1esr-5.5-2
commit 5d79d403e0963d72af518a04711f828170649134 Merge: 15243aa 3fad667 Author: Mike Perry Date: Tue Sep 15 16:57:49 2015 -0700 Merge remote-tracking branch 'arthur/16855' into tor-browser-38.2.1esr-5.5-2 docshell/base/nsDocShell.cpp |9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-38.2.1esr-5.0-2] fixup! TB4: Tor Browser's Firefox preference overrides.
commit 565b5d0020d66fc8da2874015572fe907e6fd19c
Author: Mike Perry
Date: Tue Sep 15 16:41:46 2015 -0700
fixup! TB4: Tor Browser's Firefox preference overrides.
This sets prefs for:
Bug #7446 - TorButton should not fixup .onion domains
Bug #16837 - Disable Firefox Hotfix updates
Bug #17046 - Event.timeStamp reveals startup time
---
browser/app/profile/000-tor-browser.js |3 +++
1 file changed, 3 insertions(+)
diff --git a/browser/app/profile/000-tor-browser.js
b/browser/app/profile/000-tor-browser.js
index c80c119..b94b6d1 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -14,6 +14,7 @@ pref("startup.homepage_override_url", "");
// Try to nag a bit more about updates: Pop up a restart dialog an hour after
the initial dialog
pref("app.update.promptWaitTime", 3600);
pref("app.update.badge", true);
+pref("extensions.hotfix.id", ""); // Bug 16837: Disable hotfix updates as they
may cause compat issues
// Disable "Slow startup" warnings and associated disk history
// (bug #13346)
@@ -73,6 +74,7 @@ pref("browser.newtabpage.preload", false); // Bug 16316 -
Avoid potential confus
pref("browser.search.countryCode", "US"); // The next three prefs disable
GeoIP search lookups (#16254)
pref("browser.search.region", "US");
pref("browser.search.geoip.url", "");
+pref("browser.fixup.alternate.enabled", false); // Bug #16783: Prevent .onion
fixups
// Fingerprinting
pref("webgl.min_capability_mode", true);
@@ -109,6 +111,7 @@ pref("device.sensors.enabled", false);
pref("dom.enable_resource_timing", false); // Bug 13024: To hell with this API
pref("dom.enable_user_timing", false); // Bug 16336: To hell with this API
pref("privacy.resistFingerprinting", true);
+pref("dom.event.highrestimestamp.enabled", true); // Bug #17046: "Highres"
(but truncated) timestamps prevent uptime leaks
// Third party stuff
pref("network.cookie.cookieBehavior", 1);
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-38.2.1esr-5.5-2] fixup! TB4: Tor Browser's Firefox preference overrides.
commit 15243aa153711dd09bf6e1cdcecfdd7d31d1e957
Author: Mike Perry
Date: Tue Sep 15 16:41:46 2015 -0700
fixup! TB4: Tor Browser's Firefox preference overrides.
This sets prefs for:
Bug #7446 - TorButton should not fixup .onion domains
Bug #16837 - Disable Firefox Hotfix updates
Bug #17046 - Event.timeStamp reveals startup time
---
browser/app/profile/000-tor-browser.js |3 +++
1 file changed, 3 insertions(+)
diff --git a/browser/app/profile/000-tor-browser.js
b/browser/app/profile/000-tor-browser.js
index 3e77a82..0610297 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -19,6 +19,7 @@ pref("startup.homepage_override_url",
"https://blog.torproject.org/category/tags
// Try to nag a bit more about updates: Pop up a restart dialog an hour after
the initial dialog
pref("app.update.promptWaitTime", 3600);
pref("app.update.badge", true);
+pref("extensions.hotfix.id", ""); // Bug 16837: Disable hotfix updates as they
may cause compat issues
// Disable "Slow startup" warnings and associated disk history
// (bug #13346)
@@ -78,6 +79,7 @@ pref("browser.newtabpage.preload", false); // Bug 16316 -
Avoid potential confus
pref("browser.search.countryCode", "US"); // The next three prefs disable
GeoIP search lookups (#16254)
pref("browser.search.region", "US");
pref("browser.search.geoip.url", "");
+pref("browser.fixup.alternate.enabled", false); // Bug #16783: Prevent .onion
fixups
// Fingerprinting
pref("webgl.min_capability_mode", true);
@@ -114,6 +116,7 @@ pref("device.sensors.enabled", false);
pref("dom.enable_resource_timing", false); // Bug 13024: To hell with this API
pref("dom.enable_user_timing", false); // Bug 16336: To hell with this API
pref("privacy.resistFingerprinting", true);
+pref("dom.event.highrestimestamp.enabled", true); // Bug #17046: "Highres"
(but truncated) timestamps prevent uptime leaks
// Third party stuff
pref("network.cookie.cookieBehavior", 1);
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-bundle/maint-5.0] Bug 16783: Normalize NoScript default whitelist
commit 079f1dcba2ac77c33bb232bc12f9f88ebb1c1774
Author: Mike Perry
Date: Tue Sep 15 16:12:28 2015 -0700
Bug 16783: Normalize NoScript default whitelist
This ensures that if/when the NoScript whitelist is reset, the right list is
there. The most important change here is noscript.mandatory, as NoScript
ensures that those elements are in the whitelist every restart (and on New
Identity).
---
.../Browser/profile.default/preferences/extension-overrides.js|5 +++--
.../Browser/profile.default/preferences/extension-overrides.js|5 +++--
.../Browser/profile.default/preferences/extension-overrides.js|5 +++--
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git
a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js
b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js
index 26b019c..83d4bbf 100644
---
a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js
+++
b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js
@@ -17,13 +17,14 @@ pref("extensions.https_everywhere.toolbar_hint_shown",
true);
# NoScript Preferences:
pref("capability.policy.maonoscript.javascript.enabled", "allAccess");
-pref("capability.policy.maonoscript.sites", "about: chrome: resource:");
+pref("capability.policy.maonoscript.sites", "about: chrome: resource: blob:
mediasource: moz-safe-about:");
+pref("noscript.default", "about: chrome: resource: blob: mediasource:
moz-safe-about:");
+pref("noscript.mandatory", "about: chrome: resource: blob: mediasource:
moz-safe-about:");
pref("noscript.ABE.enabled", false);
pref("noscript.ABE.notify", false);
pref("noscript.ABE.wanIpAsLocal", false);
pref("noscript.confirmUnblock", false);
pref("noscript.contentBlocker", true);
-pref("noscript.default", "about: chrome: resources:");
pref("noscript.firstRunRedirection", false);
pref("noscript.global", true);
pref("noscript.gtemp", "");
diff --git
a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js
b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js
index 26b019c..83d4bbf 100644
---
a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js
+++
b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js
@@ -17,13 +17,14 @@ pref("extensions.https_everywhere.toolbar_hint_shown",
true);
# NoScript Preferences:
pref("capability.policy.maonoscript.javascript.enabled", "allAccess");
-pref("capability.policy.maonoscript.sites", "about: chrome: resource:");
+pref("capability.policy.maonoscript.sites", "about: chrome: resource: blob:
mediasource: moz-safe-about:");
+pref("noscript.default", "about: chrome: resource: blob: mediasource:
moz-safe-about:");
+pref("noscript.mandatory", "about: chrome: resource: blob: mediasource:
moz-safe-about:");
pref("noscript.ABE.enabled", false);
pref("noscript.ABE.notify", false);
pref("noscript.ABE.wanIpAsLocal", false);
pref("noscript.confirmUnblock", false);
pref("noscript.contentBlocker", true);
-pref("noscript.default", "about: chrome: resources:");
pref("noscript.firstRunRedirection", false);
pref("noscript.global", true);
pref("noscript.gtemp", "");
diff --git
a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js
b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js
index d92bd3b..83d4bbf 100644
---
a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js
+++
b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js
@@ -17,13 +17,14 @@ pref("extensions.https_everywhere.toolbar_hint_shown",
true);
# NoScript Preferences:
pref("capability.policy.maonoscript.javascript.enabled", "allAccess");
-pref("capability.policy.maonoscript.sites", "about: chrome: resource:");
+pref("capability.policy.maonoscript.sites", "about: chrome: resource: blob:
mediasource: moz-safe-about:");
+pref("noscript.default", "about: chrome: resource: blob: mediasource:
moz-safe-about:");
+pref("noscript.mandatory", "about: chrome: resource: blob: mediasource:
moz-safe-about:");
pref("noscript.ABE.enabled", false);
pref("noscript.ABE.notify", false);
pref("noscript.ABE.wanIpAsLocal", false);
pref("noscript.confirmUnblock", false);
pref("noscript.contentBlocker", true);
-pref("noscript.default", "about: chrome: resource:");
pref("noscript.firstRunRedirection", false);
pref("noscript.global", true);
pref("noscript.gtemp", "");
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-bundle/master] Bug 16783: Normalize NoScript default whitelist
commit 41adead1637a07ec370fbab90e95324d62c2d1a6
Author: Mike Perry
Date: Tue Sep 15 16:12:28 2015 -0700
Bug 16783: Normalize NoScript default whitelist
This ensures that if/when the NoScript whitelist is reset, the right list is
there. The most important change here is noscript.mandatory, as NoScript
ensures that those elements are in the whitelist every restart (and on New
Identity).
---
.../Browser/profile.default/preferences/extension-overrides.js|5 +++--
.../Browser/profile.default/preferences/extension-overrides.js|5 +++--
.../Browser/profile.default/preferences/extension-overrides.js|5 +++--
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git
a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js
b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js
index 26b019c..83d4bbf 100644
---
a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js
+++
b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js
@@ -17,13 +17,14 @@ pref("extensions.https_everywhere.toolbar_hint_shown",
true);
# NoScript Preferences:
pref("capability.policy.maonoscript.javascript.enabled", "allAccess");
-pref("capability.policy.maonoscript.sites", "about: chrome: resource:");
+pref("capability.policy.maonoscript.sites", "about: chrome: resource: blob:
mediasource: moz-safe-about:");
+pref("noscript.default", "about: chrome: resource: blob: mediasource:
moz-safe-about:");
+pref("noscript.mandatory", "about: chrome: resource: blob: mediasource:
moz-safe-about:");
pref("noscript.ABE.enabled", false);
pref("noscript.ABE.notify", false);
pref("noscript.ABE.wanIpAsLocal", false);
pref("noscript.confirmUnblock", false);
pref("noscript.contentBlocker", true);
-pref("noscript.default", "about: chrome: resources:");
pref("noscript.firstRunRedirection", false);
pref("noscript.global", true);
pref("noscript.gtemp", "");
diff --git
a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js
b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js
index 26b019c..83d4bbf 100644
---
a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js
+++
b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js
@@ -17,13 +17,14 @@ pref("extensions.https_everywhere.toolbar_hint_shown",
true);
# NoScript Preferences:
pref("capability.policy.maonoscript.javascript.enabled", "allAccess");
-pref("capability.policy.maonoscript.sites", "about: chrome: resource:");
+pref("capability.policy.maonoscript.sites", "about: chrome: resource: blob:
mediasource: moz-safe-about:");
+pref("noscript.default", "about: chrome: resource: blob: mediasource:
moz-safe-about:");
+pref("noscript.mandatory", "about: chrome: resource: blob: mediasource:
moz-safe-about:");
pref("noscript.ABE.enabled", false);
pref("noscript.ABE.notify", false);
pref("noscript.ABE.wanIpAsLocal", false);
pref("noscript.confirmUnblock", false);
pref("noscript.contentBlocker", true);
-pref("noscript.default", "about: chrome: resources:");
pref("noscript.firstRunRedirection", false);
pref("noscript.global", true);
pref("noscript.gtemp", "");
diff --git
a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js
b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js
index d92bd3b..83d4bbf 100644
---
a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js
+++
b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js
@@ -17,13 +17,14 @@ pref("extensions.https_everywhere.toolbar_hint_shown",
true);
# NoScript Preferences:
pref("capability.policy.maonoscript.javascript.enabled", "allAccess");
-pref("capability.policy.maonoscript.sites", "about: chrome: resource:");
+pref("capability.policy.maonoscript.sites", "about: chrome: resource: blob:
mediasource: moz-safe-about:");
+pref("noscript.default", "about: chrome: resource: blob: mediasource:
moz-safe-about:");
+pref("noscript.mandatory", "about: chrome: resource: blob: mediasource:
moz-safe-about:");
pref("noscript.ABE.enabled", false);
pref("noscript.ABE.notify", false);
pref("noscript.ABE.wanIpAsLocal", false);
pref("noscript.confirmUnblock", false);
pref("noscript.contentBlocker", true);
-pref("noscript.default", "about: chrome: resource:");
pref("noscript.firstRunRedirection", false);
pref("noscript.global", true);
pref("noscript.gtemp", "");
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-spec/master] Release process file permissions fixes.
commit 8a06b105bd1699e98d819d5ea4a4f505f246c50e
Author: Mike Perry
Date: Fri Aug 28 13:25:30 2015 -0700
Release process file permissions fixes.
---
processes/ReleaseProcess | 15 ---
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/processes/ReleaseProcess b/processes/ReleaseProcess
index dddf02e..7a07ead 100644
--- a/processes/ReleaseProcess
+++ b/processes/ReleaseProcess
@@ -89,9 +89,9 @@
#. Clear out old builds, transfer builds to staticiforme
#. Remote:
# We must use $TORBROWSER_VERSION here because signed result dirs should
omit the build number suffix
- torsocks rsync -avP $TORBROWSER_VERSION
staticiforme.torproject.org:/srv/dist-master.torproject.org/htdocs/torbrowser/
- torsocks ssh staticiforme.torproject.org "chmod g+w,o+r -R
/srv/dist-master.torproject.org/htdocs/torbrowser/*"
- torsocks ssh staticiforme.torproject.org "static-update-component
dist.torproject.org"
+ rsync -avP $TORBROWSER_VERSION
staticiforme.torproject.org:/srv/dist-master.torproject.org/htdocs/torbrowser/
+ ssh staticiforme.torproject.org "chmod g+w,o+r -R
/srv/dist-master.torproject.org/htdocs/torbrowser/*"
+ ssh staticiforme.torproject.org "static-update-component
dist.torproject.org"
#. Local to staticiforme:
cd ~/tbb-builds/tor-browser-bundle/gitian
git pull origin
@@ -133,12 +133,13 @@
# responses!
make update_responses # (or update_responses-alpha, update_responses-beta)
cd ../tools/update-responses
- # XXX: nothing sets $TORBROWSER_UPDATE_CHANNEL here..
- chmod 664 htdocs/$TORBROWSER_UPDATE_CHANNEL/*
- chmod 664 htdocs/$TORBROWSER_UPDATE_CHANNEL/.htaccess
- chmod 775 htdocs/$TORBROWSER_UPDATE_CHANNEL/
+ export TORBROWSER_UPDATE_CHANNEL=release # or alpha / beta
+ chmod 664 htdocs/${TORBROWSER_UPDATE_CHANNEL}/*
+ chmod 664 htdocs/${TORBROWSER_UPDATE_CHANNEL}/.htaccess
+ chmod 775 htdocs/${TORBROWSER_UPDATE_CHANNEL}/
torsocks ssh staticiforme.torproject.org "rm -rf
/srv/dist-master.torproject.org/htdocs/torbrowser/update_2/${TORBROWSER_UPDATE_CHANNEL}/*"
torsocks rsync -avP htdocs/$TORBROWSER_UPDATE_CHANNEL
staticiforme.torproject.org:/srv/dist-master.torproject.org/htdocs/torbrowser/update_2/
+ torsocks ssh staticiforme.torproject.org "chown -R :torwww
/srv/dist-master.torproject.org/htdocs/torbrowser/update_2/${TORBROWSER_UPDATE_CHANNEL}/*"
# Finally, remove old version as we point the update channel at the new
version.
# XXX: CAREFUL! $OLD_TOR_BROWSER_VERSION must be set!
torsocks ssh staticiforme.torproject.org "rm -rf
/srv/dist-master.torproject.org/htdocs/torbrowser/$OLD_TORBROWSER_VERSION"
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/master] Bump TBB version for 5.0.2.
commit 3dd1e9964e81e120689b823b4553c68a926623a9 Author: Mike Perry Date: Thu Aug 27 13:12:48 2015 -0700 Bump TBB version for 5.0.2. --- include/versions.wmi | 12 ++-- projects/torbrowser/RecommendedTBBVersions |4 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index 8e636e1..bda8d2c 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -18,10 +18,10 @@ 0.2.3.25 0.2.4.17-rc -5.0.1 +5.0.2 5.5a1 -5.0.1 +5.0.2 5.5a1 0.2.4.19 libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.1e @@ -31,8 +31,8 @@ 3.2 1.3.21 -5.0.1 -5.0.1 +5.0.2 +5.0.2 5.5a1 5.5a1 0.2.4.19 @@ -40,8 +40,8 @@ 24.2.0esr 1.5.2 -5.0.1 -5.0.1 +5.0.2 +5.0.2 5.5a1 0.2.4.19 24.2.0esr diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index 9d3096a..92a322c 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -7,6 +7,10 @@ "5.0.1-Linux", "5.0.1-MacOS", "5.0.1-Windows", +"5.0.2", +"5.0.2-Linux", +"5.0.2-MacOS", +"5.0.2-Windows", "5.5a1", "5.5a1-Linux", "5.5a1-MacOS", ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-bundle/master] Bump version for Firefox commit fix.
commit 005158dcefdd5c7bebbbdbec3ff20e6963b37d89
Author: Mike Perry
Date: Wed Aug 26 22:32:32 2015 -0700
Bump version for Firefox commit fix.
---
gitian/versions.alpha |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index ac4e892..e722408 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -8,7 +8,7 @@ FIREFOX_VERSION=38.2.1esr
TORBROWSER_UPDATE_CHANNEL=alpha
-TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-1-build1
+TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-2-build2
TOR_TAG=tor-0.2.7.2-alpha
TORLAUNCHER_TAG=0.2.7.7
TORBUTTON_TAG=1.9.3.3
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-bundle/maint-5.0] Bump version for 5.0.2.
commit 4445b60ab4834ed2652de8c008b42c4020f1fb9a
Author: Mike Perry
Date: Wed Aug 26 18:50:37 2015 -0700
Bump version for 5.0.2.
---
gitian/versions |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gitian/versions b/gitian/versions
index d163e28..f5e4331 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -8,7 +8,7 @@ FIREFOX_VERSION=38.2.1esr
TORBROWSER_UPDATE_CHANNEL=release
-TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-1-build1
+TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-2-build1
TOR_TAG=tor-0.2.6.10
TORLAUNCHER_TAG=0.2.7.7
TORBUTTON_TAG=1.9.3.2
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-bundle/maint-5.0] Add changelog for 5.0.2.
commit 05f550a115c934912f4553690a12e10a82f5e0a1 Author: Mike Perry Date: Wed Aug 26 13:32:09 2015 -0700 Add changelog for 5.0.2. --- Bundle-Data/Docs/ChangeLog.txt |7 +++ 1 file changed, 7 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 5795e76..03e460e 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,10 @@ +Tor Browser 5.0.2 -- August 27 2015 + * All Platforms + * Update Firefox to 38.2.1esr + * Update NoScript to 2.6.9.36 + * Linux + * Bug 16860: Avoid duplicate icons on Unity and Gnome + Tor Browser 5.0.1 -- August 18 2015 * All Platforms * Bug 16771: Fix crash on some websites due to blob URIs ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-bundle/maint-5.0] Update update responses for 5.0.2.
commit 21ae799da7b8ade053a39a6a8d60c84878bfcc2b Author: Mike Perry Date: Wed Aug 26 13:31:56 2015 -0700 Update update responses for 5.0.2. --- tools/update-responses/config.yml | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index fd0e1ee..442e4a0 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -10,15 +10,15 @@ build_targets: osx64: Darwin_x86_64-gcc3 channels: alpha: 5.5a1 -release: 5.0.1 +release: 5.0.2 versions: -5.0.1: -platformVersion: 38.2.0 +5.0.2: +platformVersion: 38.2.1 detailsURL: https://www.torproject.org/projects/torbrowser.html.en -download_url: https://www.torproject.org/dist/torbrowser/5.0.1 +download_url: https://www.torproject.org/dist/torbrowser/5.0.2 incremental_from: - - 4.5.3 - 5.0 + - 5.0.1 migrate_archs: osx32: osx64 osx32: ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-bundle/maint-5.0] Bump versions for 5.0.2.
commit 5e821a73c4b6ad5f9603928704b8261fd894160b
Author: Mike Perry
Date: Wed Aug 26 13:31:12 2015 -0700
Bump versions for 5.0.2.
---
gitian/versions |8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/gitian/versions b/gitian/versions
index 98238c6..d163e28 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -4,11 +4,11 @@ BUILD_PT_BUNDLES=1
VERIFY_TAGS=1
-FIREFOX_VERSION=38.2.0esr
+FIREFOX_VERSION=38.2.1esr
TORBROWSER_UPDATE_CHANNEL=release
-TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-1-build3
+TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-1-build1
TOR_TAG=tor-0.2.6.10
TORLAUNCHER_TAG=0.2.7.7
TORBUTTON_TAG=1.9.3.2
@@ -57,7 +57,7 @@ GO_VER=1.4.2
## File names for the source packages
OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz
GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2
-NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.34-sm+fn+fx.xpi
+NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.36-sm+fx+fn.xpi
TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz
TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz
OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz
@@ -86,7 +86,7 @@
OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf
OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc
TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645
TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9
-NOSCRIPT_HASH=d17e3eeb8cc6ddc6c6cabd002184eced5c8cf061c9d337bac2085e7d2daceacd
+NOSCRIPT_HASH=0585d95161711f6e4bcd56ed6f160c15bbf08ab6c559a675ce659e6c8ffb150d
MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067
PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c
ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-bundle/master] List 5.5a2 in update responses
commit 973a6ac1b752b7b5c89c8e8bd08b8674486b4384 Author: Mike Perry Date: Wed Aug 26 13:32:29 2015 -0700 List 5.5a2 in update responses --- tools/update-responses/config.yml |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index fad836a..761a987 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -23,7 +23,7 @@ versions: osx32: minSupportedOSVersion: 10.8 detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#updating -5.5a1: +5.5a2: platformVersion: 38.2.1 detailsURL: https://www.torproject.org/projects/torbrowser.html.en download_url: https://www.torproject.org/dist/torbrowser/5.5a2 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-bundle/master] Bump Tor Browser and NoScript version.
commit 8df4b0ecf696712853d83944d3685c6212b249cc
Author: Mike Perry
Date: Wed Aug 26 13:00:39 2015 -0700
Bump Tor Browser and NoScript version.
---
gitian/versions.alpha |8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index 5af64da..ac4e892 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -4,11 +4,11 @@ BUILD_PT_BUNDLES=1
VERIFY_TAGS=1
-FIREFOX_VERSION=38.2.0esr
+FIREFOX_VERSION=38.2.1esr
TORBROWSER_UPDATE_CHANNEL=alpha
-TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-1-build3
+TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-1-build1
TOR_TAG=tor-0.2.7.2-alpha
TORLAUNCHER_TAG=0.2.7.7
TORBUTTON_TAG=1.9.3.3
@@ -59,7 +59,7 @@ NOTOCJKFONT_VER=1.004
## File names for the source packages
OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz
GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2
-NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.34-sm+fn+fx.xpi
+NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.36-sm+fx+fn.xpi
TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz
TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz
OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz
@@ -89,7 +89,7 @@
OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf
OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc
TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645
TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9
-NOSCRIPT_HASH=d17e3eeb8cc6ddc6c6cabd002184eced5c8cf061c9d337bac2085e7d2daceacd
+NOSCRIPT_HASH=0585d95161711f6e4bcd56ed6f160c15bbf08ab6c559a675ce659e6c8ffb150d
MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067
PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c
ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-bundle/master] Revert "Bug 12240: Building OpenSSL reproducibly with LXC"
commit b566f9f13978874e3d27428e56d44aec19421780 Author: Mike Perry Date: Wed Aug 26 12:44:17 2015 -0700 Revert "Bug 12240: Building OpenSSL reproducibly with LXC" This reverts commit b8633570c5ae6b2881096e318889c335c958e1c2. Reverting this to speed the rebuild process for 5.5a2. --- gitian/descriptors/mac/gitian-utils.yml | 20 +--- gitian/mkbundle-mac.sh |2 +- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/gitian/descriptors/mac/gitian-utils.yml b/gitian/descriptors/mac/gitian-utils.yml index d457fef..c47767e 100644 --- a/gitian/descriptors/mac/gitian-utils.yml +++ b/gitian/descriptors/mac/gitian-utils.yml @@ -16,8 +16,6 @@ reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://github.com/libevent/libevent.git"; "dir": "libevent" -- "url": "https://github.com/wolfcw/libfaketime"; - "dir": "faketime" files: - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" @@ -26,7 +24,6 @@ files: - "gmp.tar.bz2" - "versions" - "dzip.sh" -- "libfaketime.patch" script: | INSTDIR="$HOME/install" source versions @@ -47,17 +44,8 @@ script: | ~/build/dzip.sh gcc-$GCC_VER-linux64-precise-utils.zip gcc cp *utils.zip $OUTDIR/ else -# Building libfaketime. -cd faketime -export GIT_COMMITTER_NAME="nobody" -export GIT_COMMITTER_EMAIL="nobody@localhost" -export GIT_COMMITTER_DATE="$REFERENCE_DATETIME" -git am ~/build/libfaketime.patch -make -DESTDIR="$INSTDIR/faketime" make install -export FAKETIME_SKIP_CMDS="make" +export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME -cd .. sudo dpkg -i *.deb tar xaf multiarch-darwin*tar.xz @@ -77,7 +65,6 @@ script: | ./autogen.sh find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" ./configure --disable-static --host=i686-apple-darwin11 --prefix=$INSTDIR/libevent -export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" make $MAKEOPTS make install cd .. @@ -97,15 +84,10 @@ script: | # Building GMP tar xjf gmp.tar.bz2 cd gmp-* -# |configure| can't cope with nano seconds faked. And even if we would revert -# that feature it would hang sometimes for unknown but to libfaketime related -# reasons. -export LD_PRELOAD="" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # Even if we are not shipping libgmpxx anymore we still need --enable-xcc # during compile time. ./configure --host=x86_64-apple-darwin11 --prefix=$INSTDIR/gmp --disable-static --enable-shared --enable-cxx -export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" make make install cd .. diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 4e458bd..cf54e19 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -114,7 +114,7 @@ then echo echo "** Starting Utilities Component of Mac Bundle (1/5 for Mac) **" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit libevent=$LIBEVENT_TAG,faketime=$FAKETIME_TAG $DESCRIPTOR_DIR/mac/gitian-utils.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit libevent=$LIBEVENT_TAG $DESCRIPTOR_DIR/mac/gitian-utils.yml if [ $? -ne 0 ]; then #mv var/build.log ./utils-fail-mac.log.`date +%Y%m%d%H%M%S` ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-bundle/master] Changelog for 5.5a2.
commit acc5273d78550f625c4c0abd3c70bbdd5975717e Author: Mike Perry Date: Wed Aug 26 13:10:00 2015 -0700 Changelog for 5.5a2. --- Bundle-Data/Docs/ChangeLog.txt |8 1 file changed, 8 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 032675f..083c339 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,11 @@ +Tor Browser 5.5a2 -- August 26 2015 + * All Platforms: + * Update Firefox to 38.2.1esr + * Update NoScript to 2.6.9.36 + * Bug 16771: Fix crash on some websites due to blob URIs + * Linux + * Bug 16860: Avoid duplicate desktop icons on Gnome and Unity + Tor Browser 5.0.1 -- August 18 2015 * All Platforms * Bug 16771: Fix crash on some websites due to blob URIs ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-bundle/master] Update update responses.
commit f38dfc3c01e109a0ee03343b270764e17282a4b3 Author: Mike Perry Date: Wed Aug 26 13:02:53 2015 -0700 Update update responses. --- tools/update-responses/config.yml |8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 4d2e7cb..fad836a 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -9,7 +9,7 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: -alpha: 5.5a1 +alpha: 5.5a2 release: 5.0 versions: 5.0: @@ -24,11 +24,11 @@ versions: minSupportedOSVersion: 10.8 detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#updating 5.5a1: -platformVersion: 38.2.0 +platformVersion: 38.2.1 detailsURL: https://www.torproject.org/projects/torbrowser.html.en -download_url: https://www.torproject.org/dist/torbrowser/5.5a1 +download_url: https://www.torproject.org/dist/torbrowser/5.5a2 incremental_from: - - 5.0a4 + - 5.5a1 migrate_archs: osx32: osx64 osx32: ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-spec/master] Some release process tweaks.
commit e5dba878f924d1f2230b487a4303dbaf2033517a
Author: Mike Perry
Date: Wed Aug 19 03:08:40 2015 -0700
Some release process tweaks.
---
processes/ReleaseProcess | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/processes/ReleaseProcess b/processes/ReleaseProcess
index b4dca6a..dddf02e 100644
--- a/processes/ReleaseProcess
+++ b/processes/ReleaseProcess
@@ -89,7 +89,7 @@
#. Clear out old builds, transfer builds to staticiforme
#. Remote:
# We must use $TORBROWSER_VERSION here because signed result dirs should
omit the build number suffix
- torsocks rsync -avP $TORBROWSER_VERSION
staticiforme.torproject.org:/srv/dist-master.torproject.org/htdocs/torbrowser/$TORBROWSER_VERSION
+ torsocks rsync -avP $TORBROWSER_VERSION
staticiforme.torproject.org:/srv/dist-master.torproject.org/htdocs/torbrowser/
torsocks ssh staticiforme.torproject.org "chmod g+w,o+r -R
/srv/dist-master.torproject.org/htdocs/torbrowser/*"
torsocks ssh staticiforme.torproject.org "static-update-component
dist.torproject.org"
#. Local to staticiforme:
@@ -98,13 +98,16 @@
eval $( ./get-tb-version release ) # or alpha / beta
# We must use $TORBROWSER_VERSION here because signed result dirs should
omit the build number suffix
wget -nH --cut-dirs=2 -r -l 1
https://people.torproject.org/~gk/builds/$TORBROWSER_VERSION
- # Verify everything was downloaded correctly
- for i in $TORBROWSER_VERSION/*.asc; do echo $i ; gpg -q $i || break; done
rm $TORBROWSER_VERSION/index.html*
mv $TORBROWSER_VERSION /srv/dist-master.torproject.org/htdocs/torbrowser/
chmod 775
/srv/dist-master.torproject.org/htdocs/torbrowser/$TORBROWSER_VERSION
chmod 664
/srv/dist-master.torproject.org/htdocs/torbrowser/$TORBROWSER_VERSION/*
+ # XXX: Need to manually get .htaccess :(
+ chmod 664
/srv/dist-master.torproject.org/htdocs/torbrowser/$TORBROWSER_VERSION/.htaccess
chown -R :torwww
/srv/dist-master.torproject.org/htdocs/torbrowser/$TORBROWSER_VERSION
+ # Verify everything was downloaded/copied correctly
+ cd /srv/dist-master.torproject.org/htdocs/torbrowser/$TORBROWSER_VERSION
+ for i in *.asc; do echo $i ; gpg -q $i || break; done
static-update-component dist.torproject.org
#. Update website's torbrowser versions file in the website git
@@ -130,9 +133,11 @@
# responses!
make update_responses # (or update_responses-alpha, update_responses-beta)
cd ../tools/update-responses
+ # XXX: nothing sets $TORBROWSER_UPDATE_CHANNEL here..
chmod 664 htdocs/$TORBROWSER_UPDATE_CHANNEL/*
chmod 664 htdocs/$TORBROWSER_UPDATE_CHANNEL/.htaccess
chmod 775 htdocs/$TORBROWSER_UPDATE_CHANNEL/
+ torsocks ssh staticiforme.torproject.org "rm -rf
/srv/dist-master.torproject.org/htdocs/torbrowser/update_2/${TORBROWSER_UPDATE_CHANNEL}/*"
torsocks rsync -avP htdocs/$TORBROWSER_UPDATE_CHANNEL
staticiforme.torproject.org:/srv/dist-master.torproject.org/htdocs/torbrowser/update_2/
# Finally, remove old version as we point the update channel at the new
version.
# XXX: CAREFUL! $OLD_TOR_BROWSER_VERSION must be set!
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/master] Add new TBB version
commit 957fff2e582e08015692b915b1948aefbd3ecd9b Author: Mike Perry Date: Mon Aug 17 18:26:19 2015 -0700 Add new TBB version --- include/versions.wmi | 12 ++-- projects/torbrowser/RecommendedTBBVersions |4 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index dda94e5..8e636e1 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -18,10 +18,10 @@ 0.2.3.25 0.2.4.17-rc -5.0 +5.0.1 5.5a1 -5.0 +5.0.1 5.5a1 0.2.4.19 libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.1e @@ -31,8 +31,8 @@ 3.2 1.3.21 -5.0 -5.0 +5.0.1 +5.0.1 5.5a1 5.5a1 0.2.4.19 @@ -40,8 +40,8 @@ 24.2.0esr 1.5.2 -5.0 -5.0 +5.0.1 +5.0.1 5.5a1 0.2.4.19 24.2.0esr diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index 3584489..9d3096a 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -3,6 +3,10 @@ "5.0-Linux", "5.0-MacOS", "5.0-Windows", +"5.0.1", +"5.0.1-Linux", +"5.0.1-MacOS", +"5.0.1-Windows", "5.5a1", "5.5a1-Linux", "5.5a1-MacOS", ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-38.2.0esr-5.5-1] fixup! Bug #15502. Isolate blob, mediasource & mediastream URLs to first party
commit b5ded517ea69201328825c95785200cb1c5bb829
Author: Arthur Edelstein
Date: Wed Aug 12 12:26:34 2015 -0700
fixup! Bug #15502. Isolate blob, mediasource & mediastream URLs to first
party
---
dom/base/nsHostObjectProtocolHandler.cpp |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dom/base/nsHostObjectProtocolHandler.cpp
b/dom/base/nsHostObjectProtocolHandler.cpp
index 429938b..114b45c 100644
--- a/dom/base/nsHostObjectProtocolHandler.cpp
+++ b/dom/base/nsHostObjectProtocolHandler.cpp
@@ -351,7 +351,7 @@ nsHostObjectProtocolHandler::RemoveDataEntry(const
nsACString& aUri,
{
if (gDataTable) {
DataInfo* info = GetDataInfo(aUri);
-if (info->mFirstPartyHost == aIsolationKey) {
+if (info && info->mFirstPartyHost == aIsolationKey) {
nsCString uriIgnoringRef;
int32_t hashPos = aUri.FindChar('#');
if (hashPos < 0) {
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-bundle/maint-5.0] Bump versions for 5.0.1.
commit 1eaebdd5a59a1ba22e3001aecc4329720a5255a2
Author: Mike Perry
Date: Sun Aug 16 14:06:53 2015 -0700
Bump versions for 5.0.1.
---
Bundle-Data/Docs/ChangeLog.txt|4
gitian/versions |2 +-
tools/update-responses/config.yml |7 ---
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index 10fc5a1..5795e76 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,7 @@
+Tor Browser 5.0.1 -- August 18 2015
+ * All Platforms
+ * Bug 16771: Fix crash on some websites due to blob URIs
+
Tor Browser 5.5a1 -- August 11 2015
* All Platforms
* Update Firefox to 38.2.0esr
diff --git a/gitian/versions b/gitian/versions
index 6b6f290..98238c6 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -8,7 +8,7 @@ FIREFOX_VERSION=38.2.0esr
TORBROWSER_UPDATE_CHANNEL=release
-TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-1-build2
+TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-1-build3
TOR_TAG=tor-0.2.6.10
TORLAUNCHER_TAG=0.2.7.7
TORBUTTON_TAG=1.9.3.2
diff --git a/tools/update-responses/config.yml
b/tools/update-responses/config.yml
index 4d2e7cb..fd0e1ee 100644
--- a/tools/update-responses/config.yml
+++ b/tools/update-responses/config.yml
@@ -10,14 +10,15 @@ build_targets:
osx64: Darwin_x86_64-gcc3
channels:
alpha: 5.5a1
-release: 5.0
+release: 5.0.1
versions:
-5.0:
+5.0.1:
platformVersion: 38.2.0
detailsURL: https://www.torproject.org/projects/torbrowser.html.en
-download_url: https://www.torproject.org/dist/torbrowser/5.0
+download_url: https://www.torproject.org/dist/torbrowser/5.0.1
incremental_from:
- 4.5.3
+ - 5.0
migrate_archs:
osx32: osx64
osx32:
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-38.2.0esr-5.0-1] fixup! Bug #15502. Isolate blob, mediasource & mediastream URLs to first party
commit 52e988762c262920f52a7f4b9b89c64f04da3c4c
Author: Arthur Edelstein
Date: Wed Aug 12 12:26:34 2015 -0700
fixup! Bug #15502. Isolate blob, mediasource & mediastream URLs to first
party
---
dom/base/nsHostObjectProtocolHandler.cpp |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dom/base/nsHostObjectProtocolHandler.cpp
b/dom/base/nsHostObjectProtocolHandler.cpp
index 429938b..114b45c 100644
--- a/dom/base/nsHostObjectProtocolHandler.cpp
+++ b/dom/base/nsHostObjectProtocolHandler.cpp
@@ -351,7 +351,7 @@ nsHostObjectProtocolHandler::RemoveDataEntry(const
nsACString& aUri,
{
if (gDataTable) {
DataInfo* info = GetDataInfo(aUri);
-if (info->mFirstPartyHost == aIsolationKey) {
+if (info && info->mFirstPartyHost == aIsolationKey) {
nsCString uriIgnoringRef;
int32_t hashPos = aUri.FindChar('#');
if (hashPos < 0) {
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/master] Unrecommend 4.5.3 and 5.0a4.
commit 23218f7cae6ffd5d2939bc7121387e0f5d4aa265 Author: Mike Perry Date: Tue Aug 11 13:24:31 2015 -0700 Unrecommend 4.5.3 and 5.0a4. --- projects/torbrowser/RecommendedTBBVersions |8 1 file changed, 8 deletions(-) diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index 7b72577..3584489 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -1,16 +1,8 @@ [ -"4.5.3", -"4.5.3-Linux", -"4.5.3-MacOS", -"4.5.3-Windows", "5.0", "5.0-Linux", "5.0-MacOS", "5.0-Windows", -"5.0a4", -"5.0a4-Linux", -"5.0a4-MacOS", -"5.0a4-Windows", "5.5a1", "5.5a1-Linux", "5.5a1-MacOS", ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/master] Also update the win32 stable version.
commit 3a467938a52ca6e468a221f854f813e5ef9451f3 Author: Mike Perry Date: Tue Aug 11 13:13:20 2015 -0700 Also update the win32 stable version. --- include/versions.wmi |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/versions.wmi b/include/versions.wmi index a006e8f..dda94e5 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -1,7 +1,7 @@ 0.2.6.10 0.2.7.2-alpha -0.2.6.9 +0.2.6.10 0.2.4.23 0.2.4.23 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/master] List 5.0 and 5.5a1 on the download pages.
commit 58ac3ecb0334f7b5698c1b92c30b9e34129f7856 Author: Mike Perry Date: Tue Aug 11 13:04:16 2015 -0700 List 5.0 and 5.5a1 on the download pages. --- include/versions.wmi | 22 +++--- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index 7c766d3..a006e8f 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -18,11 +18,11 @@ 0.2.3.25 0.2.4.17-rc -4.5.3 -5.0a4 +5.0 +5.5a1 -4.5.3 -5.0a4 +5.0 +5.5a1 0.2.4.19 libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.1e 24.2.0esr @@ -31,18 +31,18 @@ 3.2 1.3.21 -4.5.3 -4.5.3 -5.0a4 -5.0a4 +5.0 +5.0 +5.5a1 +5.5a1 0.2.4.19 libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.0k 24.2.0esr 1.5.2 -4.5.3 -4.5.3 -5.0a4 +5.0 +5.0 +5.5a1 0.2.4.19 24.2.0esr 1.5.2 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
