March 2016 - tor-commits - lists.torproject.org

[tor/master] Clarify ReachableAddress log messages
by nickm＠torproject.org 24 Mar '16

24 Mar '16

commit 355f78364a7d1fa3c2de0a93e68153ae65526e02 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Thu Mar 24 20:59:49 2016 +1100 Clarify ReachableAddress log messages Make it clearer that they are about outgoing connection attempts. Specify the options involved where they were missing from one log message. Clarify a comment. --- src/or/connection.c | 9 +++++---- src/or/directory.c | 13 ++++++++----- src/or/routerlist.c | 7 ++++--- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index fc9ec13..82fc1ba 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1794,7 +1794,7 @@ connection_connect_log_client_use_ip_version(const connection_t *conn) if ((must_ipv4 && tor_addr_family(&real_addr) == AF_INET6) || (must_ipv6 && tor_addr_family(&real_addr) == AF_INET)) { static int logged_backtrace = 0; - log_info(LD_BUG, "%s connection to %s violated ClientUseIPv%s 0.", + log_info(LD_BUG, "Outgoing %s connection to %s violated ClientUseIPv%s 0.", conn->type == CONN_TYPE_OR ? "OR" : "Dir", fmt_addr(&real_addr), options->ClientUseIPv4 == 0 ? "4" : "6"); @@ -1814,9 +1814,10 @@ connection_connect_log_client_use_ip_version(const connection_t *conn) /* Check if we couldn't satisfy an address family preference */ if ((!pref_ipv6 && tor_addr_family(&real_addr) == AF_INET6) || (pref_ipv6 && tor_addr_family(&real_addr) == AF_INET)) { - log_info(LD_NET, "Connection to %s doesn't satisfy ClientPreferIPv6%sPort " - "%d, with ClientUseIPv4 %d, and fascist_firewall_use_ipv6 %d " - "(ClientUseIPv6 %d and UseBridges %d).", + log_info(LD_NET, "Outgoing connection to %s doesn't satisfy " + "ClientPreferIPv6%sPort %d, with ClientUseIPv4 %d, and " + "fascist_firewall_use_ipv6 %d (ClientUseIPv6 %d and UseBridges " + "%d).", fmt_addr(&real_addr), conn->type == CONN_TYPE_OR ? "OR" : "Dir", conn->type == CONN_TYPE_OR ? options->ClientPreferIPv6ORPort diff --git a/src/or/directory.c b/src/or/directory.c index c95944b..7f30726 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -672,12 +672,13 @@ directory_choose_address_routerstatus(const routerstatus_t *status, FIREWALL_DIR_CONNECTION, 0, use_dir_ap); - /* We rejected both addresses. This isn't great. */ + /* We rejected all addresses in the relay's status. This means we can't + * connect to it. */ if (!have_or && !have_dir) { static int logged_backtrace = 0; log_info(LD_BUG, "Rejected all OR and Dir addresses from %s when " - "launching a directory connection to: IPv4 %s OR %d Dir %d " - "IPv6 %s OR %d Dir %d", routerstatus_describe(status), + "launching an outgoing directory connection to: IPv4 %s OR %d " + "Dir %d IPv6 %s OR %d Dir %d", routerstatus_describe(status), fmt_addr32(status->addr), status->or_port, status->dir_port, fmt_addr(&status->ipv6_addr), status->ipv6_orport, status->dir_port); @@ -1105,7 +1106,8 @@ directory_initiate_command_rend(const tor_addr_port_t *or_addr_port, if (or_connection && (!or_addr_port->port || tor_addr_is_null(&or_addr_port->addr))) { static int logged_backtrace = 0; - log_warn(LD_DIR, "Cannot make an OR connection without an OR port."); + log_warn(LD_DIR, "Cannot make an outgoing OR connection without an OR " + "port."); if (!logged_backtrace) { log_backtrace(LOG_INFO, LD_BUG, "Address came from"); logged_backtrace = 1; @@ -1114,7 +1116,8 @@ directory_initiate_command_rend(const tor_addr_port_t *or_addr_port, } else if (!or_connection && (!dir_addr_port->port || tor_addr_is_null(&dir_addr_port->addr))) { static int logged_backtrace = 0; - log_warn(LD_DIR, "Cannot make a Dir connection without a Dir port."); + log_warn(LD_DIR, "Cannot make an outgoing Dir connection without a Dir " + "port."); if (!logged_backtrace) { log_backtrace(LOG_INFO, LD_BUG, "Address came from"); logged_backtrace = 1; diff --git a/src/or/routerlist.c b/src/or/routerlist.c index f065c3c..1024623 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -1561,8 +1561,9 @@ router_picked_poor_directory_log(const routerstatus_t *rs) * This might be a bug. */ if (!rs) { static int logged_backtrace = 0; - log_info(LD_BUG, "Firewall denied all OR and Dir addresses for all relays " - "when searching for a directory."); + log_info(LD_BUG, "Wanted to make an outgoing directory connection, but " + "all OR and Dir addresses for all relays were not reachable. " + "Check ReachableAddresses, ClientUseIPv4, and similar options."); if (!logged_backtrace) { log_backtrace(LOG_INFO, LD_BUG, "Node search initiated by"); logged_backtrace = 1; @@ -1571,7 +1572,7 @@ router_picked_poor_directory_log(const routerstatus_t *rs) && !fascist_firewall_allows_rs(rs, FIREWALL_DIR_CONNECTION, 1) ) { log_info(LD_BUG, "Selected a directory %s with non-preferred OR and Dir " - "addresses for launching a connection: " + "addresses for launching an outgoing connection: " "IPv4 %s OR %d Dir %d IPv6 %s OR %d Dir %d", routerstatus_describe(rs), fmt_addr32(rs->addr), rs->or_port,

1 0

[tor/master] Code indentation whitespace-only fix
by nickm＠torproject.org 24 Mar '16

24 Mar '16

commit eb5a262a15c05bee8e64e66c93f3a6387c0c5cd6 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Thu Mar 24 21:56:13 2016 +1100 Code indentation whitespace-only fix --- src/or/routerlist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index bc5e2e9..ecfcb9b 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -1861,7 +1861,7 @@ router_pick_trusteddirserver_impl(const smartlist_t *sourcelist, !router_supports_extrainfo(d->digest, 1)) continue; if (requireother && me && router_digest_is_me(d->digest)) - continue; + continue; if (try_excluding && routerset_contains_routerstatus(options->ExcludeNodes, &d->fake_status, -1)) {

1 0

[tor/master] Check if fallbacks support extrainfo descriptors before requesting them
by nickm＠torproject.org 24 Mar '16

24 Mar '16

commit b1569e39c87a32b64fe06702c1f18b43eb35f5ad Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Thu Mar 24 22:03:58 2016 +1100 Check if fallbacks support extrainfo descriptors before requesting them When requesting extrainfo descriptors from a trusted directory server, check whether it is an authority or a fallback directory which supports extrainfo descriptors. Fixes bug 18489; bugfix on 90f6071d8d in tor-0.2.4.7-alpha. Reported by "atagar", patch by "teor". --- changes/bug18489 | 6 ++++++ src/or/routerlist.c | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changes/bug18489 b/changes/bug18489 new file mode 100644 index 0000000..d8c171a --- /dev/null +++ b/changes/bug18489 @@ -0,0 +1,6 @@ + o Minor bugfixes (fallback directory mirrors): + - When requesting extrainfo descriptors from a trusted directory + server, check whether it is an authority or a fallback directory + which supports extrainfo descriptors. + Fixes bug 18489; bugfix on 90f6071d8d in tor-0.2.4.7-alpha. + Reported by "atagar", patch by "teor". diff --git a/src/or/routerlist.c b/src/or/routerlist.c index ecfcb9b..7ec84f0 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -1857,8 +1857,10 @@ router_pick_trusteddirserver_impl(const smartlist_t *sourcelist, if (!d->is_running) continue; if ((type & d->type) == 0) continue; + int is_trusted_extrainfo = router_digest_is_trusted_dir_type( + d->digest, EXTRAINFO_DIRINFO); if ((type & EXTRAINFO_DIRINFO) && - !router_supports_extrainfo(d->digest, 1)) + !router_supports_extrainfo(d->digest, is_trusted_extrainfo)) continue; if (requireother && me && router_digest_is_me(d->digest)) continue;

1 0

[tor/master] Merge remote-tracking branch 'teor/bug18489'
by nickm＠torproject.org 24 Mar '16

24 Mar '16

commit ea9472d085b1344eb3abc3f9e644beff184cbce3 Merge: ea82978 b1569e3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 24 09:01:28 2016 -0400 Merge remote-tracking branch 'teor/bug18489' changes/bug18489 | 6 ++++++ src/or/routerlist.c | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-)

1 0

[tor-messenger-build/master] Update xmpp-inband-registration.patch
by sukhbir＠torproject.org 24 Mar '16

24 Mar '16

commit 1fa62272e9832659c9f2565f7966c8c9d632a51d Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Thu Mar 24 07:50:44 2016 -0400 Update xmpp-inband-registration.patch --- projects/instantbird/xmpp-inband-registration.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/instantbird/xmpp-inband-registration.patch b/projects/instantbird/xmpp-inband-registration.patch index cdf4b31..c471346 100644 --- a/projects/instantbird/xmpp-inband-registration.patch +++ b/projects/instantbird/xmpp-inband-registration.patch @@ -172,7 +172,7 @@ diff --git a/im/content/jar.mn b/im/content/jar.mn * content/instantbird/viewlog.xul content/instantbird/viewlog.js content/instantbird/viewlog.css -+* content/instantbird/xmppRegister.xul ++ content/instantbird/xmppRegister.xul + content/instantbird/xmppRegister.js #ifdef XP_MACOSX * content/instantbird/hiddenWindow.xul

1 0

[tor/master] specify in the man page that {cc} is a 2-letter ISA3166 code
by arma＠torproject.org 23 Mar '16

23 Mar '16

commit ea829784c0d9c81910ce38a6b115455b93f686dd Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Mar 23 17:49:55 2016 -0400 specify in the man page that {cc} is a 2-letter ISA3166 code --- doc/tor.1.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index a71b04f..389b9fa 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -787,7 +787,8 @@ The following options are useful only for clients (that is, if [[ExcludeNodes]] **ExcludeNodes** __node__,__node__,__...__:: A list of identity fingerprints, country codes, and address - patterns of nodes to avoid when building a circuit. Country codes must + patterns of nodes to avoid when building a circuit. Country codes are + 2-letter ISA3166 codes, and must be wrapped in braces; fingerprints may be preceded by a dollar sign. (Example: ExcludeNodes ABCD1234CDEF5678ABCD1234CDEF5678ABCD1234, \{cc}, 255.254.0.0/8) +

1 0

[tor-messenger-build/master] Rebase Bug-9173-Change-the-default-Firefox-profile-director.mozpatch
by arlo＠torproject.org 23 Mar '16

23 Mar '16

commit 0c4b8aa1fe202d0307c08fe7bc3d63b2bf113a7c Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed Mar 23 12:16:20 2016 -0700 Rebase Bug-9173-Change-the-default-Firefox-profile-director.mozpatch --- ...e-the-default-Firefox-profile-director.mozpatch | 97 +++++++++++----------- 1 file changed, 49 insertions(+), 48 deletions(-) diff --git a/projects/instantbird/Bug-9173-Change-the-default-Firefox-profile-director.mozpatch b/projects/instantbird/Bug-9173-Change-the-default-Firefox-profile-director.mozpatch index a3ca392..a0e76ea 100644 --- a/projects/instantbird/Bug-9173-Change-the-default-Firefox-profile-director.mozpatch +++ b/projects/instantbird/Bug-9173-Change-the-default-Firefox-profile-director.mozpatch @@ -14,7 +14,6 @@ launches Firefox with -profile. 4 files changed, 79 insertions(+), 192 deletions(-) diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp -index 7d09374ba773..417ebee773ba 100644 --- a/toolkit/xre/nsXREDirProvider.cpp +++ b/toolkit/xre/nsXREDirProvider.cpp @@ -32,6 +32,7 @@ @@ -25,7 +24,7 @@ index 7d09374ba773..417ebee773ba 100644 #include "mozilla/Services.h" #include "mozilla/Omnijar.h" #include "mozilla/Preferences.h" -@@ -200,9 +201,6 @@ nsXREDirProvider::GetUserProfilesRootDir(nsIFile** aResult, +@@ -200,9 +201,6 @@ nsXREDirProvider::GetUserProfilesRootDir aProfileName, aAppName, aVendorName); if (NS_SUCCEEDED(rv)) { @@ -35,7 +34,7 @@ index 7d09374ba773..417ebee773ba 100644 // We must create the profile directory here if it does not exist. nsresult tmp = EnsureDirectoryExists(file); if (NS_FAILED(tmp)) { -@@ -225,9 +223,6 @@ nsXREDirProvider::GetUserProfilesLocalDir(nsIFile** aResult, +@@ -225,9 +223,6 @@ nsXREDirProvider::GetUserProfilesLocalDi aProfileName, aAppName, aVendorName); if (NS_SUCCEEDED(rv)) { @@ -45,7 +44,7 @@ index 7d09374ba773..417ebee773ba 100644 // We must create the profile directory here if it does not exist. nsresult tmp = EnsureDirectoryExists(file); if (NS_FAILED(tmp)) { -@@ -1222,90 +1217,45 @@ nsresult +@@ -1245,90 +1240,45 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile, bool aLocal) { // Copied from nsAppFileLocationProvider (more or less) @@ -86,12 +85,23 @@ index 7d09374ba773..417ebee773ba 100644 + bool didRemove = !removedName.Equals("."); - rv = dirFileMac->InitWithFSRef(&fsRef); -- NS_ENSURE_SUCCESS(rv, rv); + // Remove a directory component. + nsCOMPtr<nsIFile> parentDir; + rv = localDir->GetParent(getter_AddRefs(parentDir)); + NS_ENSURE_SUCCESS(rv, rv); + localDir = parentDir; ++ ++ if (didRemove) ++ --levelsToRemove; ++ } ++ ++ if (!localDir) ++ return NS_ERROR_FAILURE; ++ ++ rv = localDir->AppendRelativeNativePath(NS_LITERAL_CSTRING("TorMessenger" ++ XPCOM_FILE_PATH_SEPARATOR "Data" ++ XPCOM_FILE_PATH_SEPARATOR "Browser")); + NS_ENSURE_SUCCESS(rv, rv); - localDir = do_QueryInterface(dirFileMac, &rv); -#elif defined(XP_IOS) @@ -100,7 +110,10 @@ index 7d09374ba773..417ebee773ba 100644 - rv = NS_NewNativeLocalFile(userDir, true, getter_AddRefs(localDir)); - } else { - rv = NS_ERROR_FAILURE; -- } ++ if (aLocal) { ++ rv = localDir->AppendNative(NS_LITERAL_CSTRING("Caches")); ++ NS_ENSURE_SUCCESS(rv, rv); + } - NS_ENSURE_SUCCESS(rv, rv); -#elif defined(XP_WIN) - nsString path; @@ -115,11 +128,9 @@ index 7d09374ba773..417ebee773ba 100644 - if (!aLocal) - rv = GetRegWindowsAppDataFolder(aLocal, path); - } -+ if (didRemove) -+ --levelsToRemove; - } +- } - NS_ENSURE_SUCCESS(rv, rv); - +- - rv = NS_NewLocalFile(path, true, getter_AddRefs(localDir)); -#elif defined(MOZ_WIDGET_GONK) - rv = NS_NewNativeLocalFile(NS_LITERAL_CSTRING("/data/b2g"), true, @@ -127,18 +138,13 @@ index 7d09374ba773..417ebee773ba 100644 -#elif defined(XP_UNIX) - const char* homeDir = getenv("HOME"); - if (!homeDir || !*homeDir) -+ if (!localDir) - return NS_ERROR_FAILURE; - +- return NS_ERROR_FAILURE; +- -#ifdef ANDROID /* We want (ProfD == ProfLD) on Android. */ - aLocal = false; -#endif -+ rv = localDir->AppendRelativeNativePath(NS_LITERAL_CSTRING("TorMessenger" -+ XPCOM_FILE_PATH_SEPARATOR "Data" -+ XPCOM_FILE_PATH_SEPARATOR "Browser")); -+ NS_ENSURE_SUCCESS(rv, rv); - - if (aLocal) { +- +- if (aLocal) { - // If $XDG_CACHE_HOME is defined use it, otherwise use $HOME/.cache. - const char* cacheHome = getenv("XDG_CACHE_HOME"); - if (cacheHome && *cacheHome) { @@ -153,16 +159,14 @@ index 7d09374ba773..417ebee773ba 100644 - } else { - rv = NS_NewNativeLocalFile(nsDependentCString(homeDir), true, - getter_AddRefs(localDir)); -+ rv = localDir->AppendNative(NS_LITERAL_CSTRING("Caches")); -+ NS_ENSURE_SUCCESS(rv, rv); - } +- } -#else -#error "Don't know how to get product dir on your platform" -#endif NS_IF_ADDREF(*aFile = localDir); return rv; -@@ -1518,48 +1468,25 @@ nsXREDirProvider::AppendProfilePath(nsIFile* aFile, +@@ -1541,48 +1491,25 @@ nsXREDirProvider::AppendProfilePath(nsIF } nsAutoCString profile; @@ -214,7 +218,7 @@ index 7d09374ba773..417ebee773ba 100644 #elif defined(ANDROID) // The directory used for storing profiles -@@ -1571,12 +1498,6 @@ nsXREDirProvider::AppendProfilePath(nsIFile* aFile, +@@ -1594,12 +1521,6 @@ nsXREDirProvider::AppendProfilePath(nsIF rv = aFile->AppendNative(nsDependentCString("mozilla")); NS_ENSURE_SUCCESS(rv, rv); #elif defined(XP_UNIX) @@ -227,7 +231,7 @@ index 7d09374ba773..417ebee773ba 100644 if (!profile.IsEmpty()) { // Skip any leading path characters const char* profileStart = profile.get(); -@@ -1585,31 +1506,17 @@ nsXREDirProvider::AppendProfilePath(nsIFile* aFile, +@@ -1608,31 +1529,17 @@ nsXREDirProvider::AppendProfilePath(nsIF // On the off chance that someone wanted their folder to be hidden don't // let it become ".." @@ -264,7 +268,6 @@ index 7d09374ba773..417ebee773ba 100644 #else #error "Don't know how to get profile path on your platform" diff --git a/toolkit/xre/nsXREDirProvider.h b/toolkit/xre/nsXREDirProvider.h -index eb27ed27fc26..1985f668a5b2 100644 --- a/toolkit/xre/nsXREDirProvider.h +++ b/toolkit/xre/nsXREDirProvider.h @@ -56,16 +56,16 @@ public: @@ -299,10 +302,9 @@ index eb27ed27fc26..1985f668a5b2 100644 static nsresult GetSystemExtensionsDirectory(nsIFile** aFile); #endif diff --git a/xpcom/io/moz.build b/xpcom/io/moz.build -index 69208996e4d7..280f23f6fd82 100644 --- a/xpcom/io/moz.build +++ b/xpcom/io/moz.build -@@ -132,4 +132,8 @@ FINAL_LIBRARY = 'xul' +@@ -134,4 +134,8 @@ FINAL_LIBRARY = 'xul' if CONFIG['OS_ARCH'] == 'Linux' and 'lib64' in CONFIG['libdir']: DEFINES['HAVE_USR_LIB64_DIR'] = True @@ -310,12 +312,11 @@ index 69208996e4d7..280f23f6fd82 100644 + '../build' +] + - GENERATED_INCLUDES += ['..'] + LOCAL_INCLUDES += ['!..'] diff --git a/xpcom/io/nsAppFileLocationProvider.cpp b/xpcom/io/nsAppFileLocationProvider.cpp -index 540f53fb471b..59785d5f064a 100644 --- a/xpcom/io/nsAppFileLocationProvider.cpp +++ b/xpcom/io/nsAppFileLocationProvider.cpp -@@ -14,6 +14,7 @@ +@@ -15,6 +15,7 @@ #include "nsISimpleEnumerator.h" #include "prenv.h" #include "nsCRT.h" @@ -323,7 +324,7 @@ index 540f53fb471b..59785d5f064a 100644 #if defined(MOZ_WIDGET_COCOA) #include <Carbon/Carbon.h> -@@ -280,9 +281,8 @@ nsAppFileLocationProvider::CloneMozBinDirectory(nsIFile** aLocalFile) +@@ -281,9 +282,8 @@ nsAppFileLocationProvider::CloneMozBinDi //---------------------------------------------------------------------------------------- // GetProductDirectory - Gets the directory which contains the application data folder // @@ -335,7 +336,7 @@ index 540f53fb471b..59785d5f064a 100644 //---------------------------------------------------------------------------------------- NS_METHOD nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile, -@@ -296,48 +296,45 @@ nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile, +@@ -297,48 +297,45 @@ nsAppFileLocationProvider::GetProductDir bool exists; nsCOMPtr<nsIFile> localDir; @@ -379,7 +380,16 @@ index 540f53fb471b..59785d5f064a 100644 - rv = localDirMac->InitWithFSRef(&fsRef); - if (NS_FAILED(rv)) { - return rv; -- } ++ ++ rv = localDir->AppendRelativeNativePath(NS_LITERAL_CSTRING("TorMessenger" ++ XPCOM_FILE_PATH_SEPARATOR "Data" ++ XPCOM_FILE_PATH_SEPARATOR "Browser")); ++ NS_ENSURE_SUCCESS(rv, rv); ++ ++ if (aLocal) { ++ rv = localDir->AppendNative(NS_LITERAL_CSTRING("Caches")); ++ NS_ENSURE_SUCCESS(rv, rv); + } -#elif defined(XP_WIN) - nsCOMPtr<nsIProperties> directoryService = - do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); @@ -404,20 +414,11 @@ index 540f53fb471b..59785d5f064a 100644 - rv = localDir->AppendRelativeNativePath(DEFAULT_PRODUCT_DIR); - if (NS_FAILED(rv)) { - return rv; -+ rv = localDir->AppendRelativeNativePath(NS_LITERAL_CSTRING("TorMessenger" -+ XPCOM_FILE_PATH_SEPARATOR "Data" -+ XPCOM_FILE_PATH_SEPARATOR "Browser")); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ if (aLocal) { -+ rv = localDir->AppendNative(NS_LITERAL_CSTRING("Caches")); -+ NS_ENSURE_SUCCESS(rv, rv); - } -+ +- } rv = localDir->Exists(&exists); if (NS_SUCCEEDED(rv) && !exists) { -@@ -357,10 +354,6 @@ nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile, +@@ -357,10 +354,6 @@ nsAppFileLocationProvider::GetProductDir //---------------------------------------------------------------------------------------- // GetDefaultUserProfileRoot - Gets the directory which contains each user profile dir @@ -428,7 +429,7 @@ index 540f53fb471b..59785d5f064a 100644 //---------------------------------------------------------------------------------------- NS_METHOD nsAppFileLocationProvider::GetDefaultUserProfileRoot(nsIFile** aLocalFile, -@@ -378,23 +371,6 @@ nsAppFileLocationProvider::GetDefaultUserProfileRoot(nsIFile** aLocalFile, +@@ -378,23 +371,6 @@ nsAppFileLocationProvider::GetDefaultUse return rv; } @@ -449,6 +450,6 @@ index 540f53fb471b..59785d5f064a 100644 - } -#endif - - *aLocalFile = localDir; - NS_ADDREF(*aLocalFile); + localDir.forget(aLocalFile); + return rv;

1 0

[tor-messenger-build/master] Bump Tor Browser to 5.5.4
by sukhbir＠torproject.org 23 Mar '16

23 Mar '16

commit 02164868ccc662c4c6e806c305756e6ae1a09b40 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed Mar 23 13:33:41 2016 -0400 Bump Tor Browser to 5.5.4 --- projects/tor-browser/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index be9e1eb..e0fa0f7 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 5.5.2 +version: 5.5.4 filename: 'tor-browser-[% c("version") %]-[% c("var/osname") %].[% c("var/extension") %]' input_files:

1 0

[tor-messenger-build/master] Re-remove the irc quit message
by arlo＠torproject.org 23 Mar '16

23 Mar '16

commit 6afd5822a453e6d12d866aee1d315775e7e35ecd Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed Mar 23 09:14:39 2016 -0700 Re-remove the irc quit message --- projects/instantbird/preferences.patch | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/projects/instantbird/preferences.patch b/projects/instantbird/preferences.patch index 85bd49e..2631188 100644 --- a/projects/instantbird/preferences.patch +++ b/projects/instantbird/preferences.patch @@ -103,7 +103,15 @@ diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird. // The breakpad report server to link to in about:crashes pref("breakpad.reportURL", "http://crash-stats.instantbird.com/report/index/"); -@@ -307,7 +307,61 @@ +@@ -300,14 +300,68 @@ + // 3 at the end of the tabstrip + pref("browser.tabs.closeButtons", 1); + +-#expand pref("chat.irc.defaultQuitMessage", "Instantbird __APP_VERSION__ -- http://www.instantbird.com"); ++#expand pref("chat.irc.defaultQuitMessage", ""); + + pref("chat.twitter.consumerKey", "TSuyS1ieRAkB3qWv8yyEw"); + pref("chat.twitter.consumerSecret", "DKtKaSf5a7pBNhdBsSZHTnI5Y03hRlPFYWmb4xXBlkU"); // Comma separated list of prpl ids that should use libpurple even if there is // a JS implementation. This is used to land JS-prpls pref'ed off in nightlies.

1 0

[tor-messenger-build/master] Rebase preferences.patch
by arlo＠torproject.org 23 Mar '16

23 Mar '16

commit d4c075474f7943f61668c2475bbebff0b790e9ea Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Mar 19 07:51:41 2016 -0400 Rebase preferences.patch --- projects/instantbird/preferences.patch | 163 ++++++++++----------------------- 1 file changed, 48 insertions(+), 115 deletions(-) diff --git a/projects/instantbird/preferences.patch b/projects/instantbird/preferences.patch index 9af290b..85bd49e 100644 --- a/projects/instantbird/preferences.patch +++ b/projects/instantbird/preferences.patch @@ -1,56 +1,56 @@ diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird.js --- a/im/app/profile/all-instantbird.js +++ b/im/app/profile/all-instantbird.js -@@ -59,19 +59,16 @@ pref("extensions.mintrayr.startMinimized - // For Linux, use single click. - pref("extensions.mintrayr.singleClickRestore", true); - #else - // For Windows, use double click. - pref("extensions.mintrayr.singleClickRestore", false); - #endif - #endif - --// Whether message related sounds should be played at all. If this is enabled --// then the more specific prefs are checked as well. +@@ -28,7 +28,7 @@ + // 0 = spellcheck nothing + // 1 = check multi-line controls [default] + // 2 = check multi/single line controls +-pref("layout.spellcheckDefault", 1); ++pref("layout.spellcheckDefault", 0); + + pref("messenger.accounts.convertOldPasswords", true); + pref("messenger.accounts.promptOnDelete", true); +@@ -66,18 +66,18 @@ + + // Whether message related sounds should be played at all. If this is enabled + // then the more specific prefs are checked as well. -pref("messenger.options.playSounds.message", true); ++pref("messenger.options.playSounds.message", false); // Specifies whether each message event should trigger a sound for incoming // and outgoing messages, or when your nickname is mentioned in a chat. - pref("messenger.options.playSounds.outgoing", true); - pref("messenger.options.playSounds.incoming", true); - pref("messenger.options.playSounds.alert", true); +-pref("messenger.options.playSounds.outgoing", true); +-pref("messenger.options.playSounds.incoming", true); +-pref("messenger.options.playSounds.alert", true); ++pref("messenger.options.playSounds.outgoing", false); ++pref("messenger.options.playSounds.incoming", false); ++pref("messenger.options.playSounds.alert", false); // Whether contact list related sounds should be played at all. If this is // enabled then the more specific prefs are checked as well. pref("messenger.options.playSounds.blist", false); -@@ -109,41 +106,33 @@ pref("browser.preferences.animateFadeIn" - pref("browser.zoom.full", true); - pref("conversation.zoomLevel", "1.0"); - - pref("accessibility.typeaheadfind", false); - pref("accessibility.typeaheadfind.timeout", 5000); - pref("accessibility.typeaheadfind.linksonly", false); + // Specifies whether sounds should be played on login/logout events. +-pref("messenger.options.playSounds.login", true); +-pref("messenger.options.playSounds.logout", true); ++pref("messenger.options.playSounds.login", false); ++pref("messenger.options.playSounds.logout", false); + + pref("font.default.x-western", "sans-serif"); + pref("font.default.x-unicode", "sans-serif"); +@@ -115,12 +115,12 @@ pref("accessibility.typeaheadfind.flashBar", 1); --// Whether or not app updates are enabled + // Whether or not app updates are enabled -pref("app.update.enabled", true); -- --// This preference turns on app.update.mode and allows automatic download and --// install to take place. We use a separate boolean toggle for this to make --// the UI easier to construct. ++pref("app.update.enabled", false); + + // This preference turns on app.update.mode and allows automatic download and + // install to take place. We use a separate boolean toggle for this to make + // the UI easier to construct. -pref("app.update.auto", true); -- ++pref("app.update.auto", false); + // Defines how the Application Update Service notifies the user about updates: // - // AUM Set to: Minor Releases: Major Releases: - // 0 download no prompt download no prompt - // 1 download no prompt download no prompt if no incompatibilities - // 2 download no prompt prompt - // - // See chart in nsUpdateService.js.in for more details - // - pref("app.update.mode", 1); - - // If set to true, the Update Service will present no UI for any event. - pref("app.update.silent", false); +@@ -138,7 +138,7 @@ // If set to true, the Update Service will apply updates in the background // when it finishes downloading them. @@ -59,17 +59,7 @@ diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird. // Update service URL: // You do not need to use all the %VAR% parameters. Use what you need, %PRODUCT%,%VERSION%,%BUILD_ID%,%CHANNEL% for example - pref("app.update.url", "https://update.instantbird.org/1/%PRODUCT%/%VERSION%/%BUILD_ID%/%BUILD_TARG…"); - - // URL user can browse to manually if for some reason all update installation - // attempts fail. - pref("app.update.url.manual", "http://www.instantbird.com/download.html"); -@@ -194,17 +183,17 @@ pref("browser.search.defaultenginename", - // disable logging for the search service by default - pref("browser.search.log", false); - - // Ordering of Search Engines in the Engine list. - pref("browser.search.order.1", "chrome://instantbird/locale/region.properties"); +@@ -202,7 +202,7 @@ pref("browser.search.order.2", "chrome://instantbird/locale/region.properties"); // send ping to the server to update @@ -78,17 +68,7 @@ diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird. // disable logging for the search service update system by default pref("browser.search.update.log", false); - - // Check whether we need to perform engine updates every 6 hours - pref("browser.search.updateinterval", 6); - - /* Extension manager */ -@@ -214,17 +203,17 @@ pref("xpinstall.dialog.progress.chrome", - pref("xpinstall.dialog.progress.type.skin", "Extension:Manager"); - pref("xpinstall.dialog.progress.type.chrome", "Extension:Manager"); - pref("extensions.dss.enabled", false); - pref("extensions.dss.switchPending", false); - pref("extensions.ignoreMTimeChanges", false); +@@ -222,10 +222,10 @@ pref("extensions.logging.enabled", false); pref("general.skins.selectedSkin", "classic/1.0"); @@ -96,18 +76,12 @@ diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird. +pref("extensions.update.enabled", false); pref("extensions.update.interval", 86400); pref("extensions.update.url", "https://addons.instantbird.org/services/update.php?reqVersion=%REQ_VERSION%…"); - pref("extensions.update.autoUpdateDefault", true); +-pref("extensions.update.autoUpdateDefault", true); ++pref("extensions.update.autoUpdateDefault", false); // Preferences for the Get Add-ons pane pref("extensions.getAddons.cache.enabled", false); - pref("extensions.getAddons.browseAddons", "https://addons.instantbird.org/%LOCALE%/%APP%"); - pref("extensions.getAddons.maxResults", 5); -@@ -237,35 +226,32 @@ pref("extensions.webservice.discoverURL" - pref("extensions.getMoreExtensionsURL", "https://add-ons.instantbird.org/%LOCALE%/%APP%/%VERSION%/extensions/"); - pref("extensions.getMoreThemesURL", "https://add-ons.instantbird.org/%LOCALE%/%APP%/%VERSION%/themes/"); - pref("extensions.getMorePluginsURL", "https://add-ons.instantbird.org/%LOCALE%/%APP%/%VERSION%/plugins/"); - pref("extensions.getMoreMessageStylesURL", "https://add-ons.instantbird.org/%LOCALE%/%APP%/%VERSION%/messagestyles/"); - pref("extensions.getMoreEmoticonsURL", "https://add-ons.instantbird.org/%LOCALE%/%APP%/%VERSION%/emoticons/"); +@@ -245,9 +245,9 @@ pref("extensions.getMoreProtocolsURL", "https://add-ons.instantbird.org/%LOCALE%/%APP%/%VERSION%/protocols/"); // suppress external-load warning for standard browser schemes @@ -120,41 +94,16 @@ diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird. // don't load links inside Instantbird pref("network.protocol-handler.expose-all", false); - // Although we allow these to be exposed internally, there are various places - // (e.g. message pane) where we may divert them out to external applications. - pref("network.protocol-handler.expose.about", true); - pref("network.protocol-handler.expose.http", true); - pref("network.protocol-handler.expose.https", true); - - // expose javascript: so that message themes can use it. - // javascript: links inside messages are filtered out. +@@ -262,7 +262,7 @@ pref("network.protocol-handler.expose.javascript", true); --// 0-Accept, 1-dontAcceptForeign, 2-dontUse + // 0-Accept, 1-dontAcceptForeign, 2-dontUse -pref("network.cookie.cookieBehavior", 0); -- ++pref("network.cookie.cookieBehavior", 1); + // The breakpad report server to link to in about:crashes pref("breakpad.reportURL", "http://crash-stats.instantbird.com/report/index/"); - - // We have an Error Console menu item by default so let's display chrome errors - pref("javascript.options.showInConsole", true); - #ifdef DEBUG - // In debug builds, also display warnings by default - pref("javascript.options.strict", true); -@@ -292,19 +278,89 @@ pref("browser.tabs.tabClipWidth", 140); - - // Where to show tab close buttons: - // 0 on active tab only - // 1 on all tabs until tabClipWidth is reached, then active tab only - // 2 no close buttons at all - // 3 at the end of the tabstrip - pref("browser.tabs.closeButtons", 1); - --#expand pref("chat.irc.defaultQuitMessage", "Instantbird __APP_VERSION__ -- http://www.instantbird.com"); -+#expand pref("chat.irc.defaultQuitMessage", ""); - - pref("chat.twitter.consumerKey", "TSuyS1ieRAkB3qWv8yyEw"); - pref("chat.twitter.consumerSecret", "DKtKaSf5a7pBNhdBsSZHTnI5Y03hRlPFYWmb4xXBlkU"); +@@ -307,7 +307,61 @@ // Comma separated list of prpl ids that should use libpurple even if there is // a JS implementation. This is used to land JS-prpls pref'ed off in nightlies. @@ -187,8 +136,6 @@ diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird. +pref("network.dns.disablePrefetch", true); +// Disable SPDY +pref("network.http.spdy.enabled", false); -+// Do not accept third-party cookies -+pref("network.cookie.cookieBehavior", 1); +// Set the user-agent to Instantbird stable +pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:25.0) Gecko/20100101 Instantbird/1.5"); + @@ -202,8 +149,6 @@ diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird. +pref("messenger.status.awayWhenIdle", false); +pref("messenger.status.defaultIdleAwayMessage", ""); +pref("messenger.status.reportIdle", false); -+// Do not play sounds on messaging events -+pref("messenger.options.playSounds.message", false); +// Disable text formatting (remove the tags) +pref("messenger.options.filterMode", 0); +// Disable typing notifications @@ -222,15 +167,3 @@ diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird. +// Disable hardware acceleration +pref("gfx.direct2d.disabled", true); +pref("layers.acceleration.disabled", true); -+ -+// Updates -+// Do not auto-update Instantbird -+pref("app.update.enabled", false); -+pref("app.update.auto", false); -+// Do not auto-update extensions -+pref("extensions.update.enabled", false); -+pref("extensions.update.autoUpdateDefault", false); -+// Do not send ping to the server to update -+pref("browser.search.update", false); -+// Set baseURL to Firefox default to prevent console errors -+pref("app.support.baseURL", "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/");

1 0