tor-commits May 2013

tor-commits@lists.torproject.org

20 participants
1497 discussions

r26187: {website} update mirrors. (website/trunk/include)
by Andrew Lewman 16 May '13

16 May '13

Author: phobos Date: 2013-05-16 20:28:56 +0000 (Thu, 16 May 2013) New Revision: 26187 Modified: website/trunk/include/mirrors-table.wmi Log: update mirrors. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2013-05-15 00:09:47 UTC (rev 26186) +++ website/trunk/include/mirrors-table.wmi 2013-05-16 20:28:56 UTC (rev 26187) @@ -37,6 +37,23 @@ <td>NL</td> + <td>Amorphis</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.amorphis.eu/dist/">http</a></td> + <td><a href="http://tor.amorphis.eu/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>NL</td> + <td>CCC</td> <td>Up to date</td> @@ -52,6 +69,23 @@ <tr> + <td>DK</td> + + <td>Zentrum der Gesundheit</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.idnr.ws/dist/">http</a></td> + <td><a href="http://tor.idnr.ws/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>EE</td> <td>CyberSIDE</td> @@ -222,36 +256,36 @@ <tr> - <td>DE</td> + <td>MX</td> - <td>crazyhaze.de</td> + <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.crazyhaze.de/dist/">http</a></td> - <td><a href="http://tor.crazyhaze.de/">http</a></td> - <td><a href="https://tor.crazyhaze.de/dist/">https</a></td> - <td><a href="https://tor.crazyhaze.de/">https</a></td> + <td><a href="http://fbnaia.homelinux.net/torproject/dist/">http</a></td> + <td><a href="http://fbnaia.homelinux.net/torproject/">http</a></td> + <td><a href="https://fbnaia.homelinux.net/torproject//dist/">https</a></td> + <td><a href="https://fbnaia.homelinux.net/torproject/">https</a></td> <td> - </td> <td> - </td> </tr> <tr> - <td>MX</td> + <td>RO</td> - <td></td> + <td>me0w.cc</td> <td>Up to date</td> <td> - </td> - <td><a href="http://fbnaia.homelinux.net/torproject/dist/">http</a></td> - <td><a href="http://fbnaia.homelinux.net/torproject/">http</a></td> - <td><a href="https://fbnaia.homelinux.net/torproject//dist/">https</a></td> - <td><a href="https://fbnaia.homelinux.net/torproject/">https</a></td> + <td><a href="http://tor.me0w.cc/dist/">http</a></td> + <td><a href="http://tor.me0w.cc/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> @@ -273,6 +307,23 @@ <tr> + <td>LT</td> + + <td></td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.vesta.nu/dist/">http</a></td> + <td><a href="http://tor.vesta.nu/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>DE</td> <td></td> @@ -426,23 +477,6 @@ <tr> - <td>US</td> - - <td></td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.onthegetgo.com/dist/">http</a></td> - <td><a href="http://tor.onthegetgo.com/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>HU</td> <td>Unknown</td> @@ -698,66 +732,49 @@ <tr> - <td>DE</td> + <td>SE</td> - <td>[[:bbs:]]</td> + <td>homosu</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.blingblingsquad.net/dist/">http</a></td> - <td><a href="http://tor.blingblingsquad.net/">http</a></td> - <td><a href="https://tor.blingblingsquad.net/dist/">https</a></td> - <td><a href="https://tor.blingblingsquad.net/">https</a></td> + <td><a href="http://tor.homosu.net/dist/">http</a></td> + <td><a href="http://tor.homosu.net/">http</a></td> <td> - </td> <td> - </td> -</tr> - -<tr> - - <td>US</td> - - <td></td> - - <td>Up to date</td> - <td> - </td> - <td><a href="http://mirror.nametoday.me/tor/dist/">http</a></td> - <td><a href="http://mirror.nametoday.me/tor/">http</a></td> <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>LT</td> + <td>DE</td> - <td></td> + <td>[[:bbs:]]</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.vesta.nu/dist/">http</a></td> - <td><a href="http://tor.vesta.nu/">http</a></td> + <td><a href="http://tor.blingblingsquad.net/dist/">http</a></td> + <td><a href="http://tor.blingblingsquad.net/">http</a></td> + <td><a href="https://tor.blingblingsquad.net/dist/">https</a></td> + <td><a href="https://tor.blingblingsquad.net/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>NL</td> + <td>INT</td> - <td>Amorphis</td> + <td>CoralCDN</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.amorphis.eu/dist/">http</a></td> - <td><a href="http://tor.amorphis.eu/">http</a></td> + <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> + <td><a href="http://www.torproject.org.nyud.net/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -766,15 +783,15 @@ <tr> - <td>SE</td> + <td>US</td> - <td>homosu</td> + <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.homosu.net/dist/">http</a></td> - <td><a href="http://tor.homosu.net/">http</a></td> + <td><a href="http://mirror.nametoday.me/tor/dist/">http</a></td> + <td><a href="http://mirror.nametoday.me/tor/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -783,34 +800,34 @@ <tr> - <td>DK</td> + <td>EE</td> - <td>Zentrum der Gesundheit</td> + <td></td> - <td>Up to date</td> + <td>Out of date</td> <td> - </td> - <td><a href="http://tor.idnr.ws/dist/">http</a></td> - <td><a href="http://tor.idnr.ws/">http</a></td> + <td><a href="http://tor.li/dist/">http</a></td> + <td><a href="http://tor.li/">http</a></td> + <td><a href="https://tor.li/dist/">https</a></td> + <td><a href="https://tor.li/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>EE</td> + <td>DE</td> - <td></td> + <td>crazyhaze.de</td> <td>Out of date</td> <td> - </td> - <td><a href="http://tor.li/dist/">http</a></td> - <td><a href="http://tor.li/">http</a></td> - <td><a href="https://tor.li/dist/">https</a></td> - <td><a href="https://tor.li/">https</a></td> + <td><a href="http://tor.crazyhaze.de/dist/">http</a></td> + <td><a href="http://tor.crazyhaze.de/">http</a></td> + <td><a href="https://tor.crazyhaze.de/dist/">https</a></td> + <td><a href="https://tor.crazyhaze.de/">https</a></td> <td> - </td> <td> - </td> </tr> @@ -919,15 +936,15 @@ <tr> - <td>RO</td> + <td>UA</td> - <td>me0w.cc</td> + <td></td> <td>Unknown</td> <td> - </td> - <td><a href="http://tor.me0w.cc/dist/">http</a></td> - <td><a href="http://tor.me0w.cc/">http</a></td> + <td><a href="http://torua.reactor-xg.kiev.ua/dist/">http</a></td> + <td><a href="http://torua.reactor-xg.kiev.ua/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -936,15 +953,15 @@ <tr> - <td>UA</td> + <td>US</td> <td></td> <td>Unknown</td> + <td><a href="ftp://mirrors.go-part.com/tor/dist/">ftp</a></td> + <td><a href="http://mirrors.go-part.com/tor/dist/">http</a></td> <td> - </td> - <td><a href="http://torua.reactor-xg.kiev.ua/dist/">http</a></td> - <td><a href="http://torua.reactor-xg.kiev.ua/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -959,9 +976,9 @@ <td>Unknown</td> - <td><a href="ftp://mirrors.go-part.com/tor/dist/">ftp</a></td> - <td><a href="http://mirrors.go-part.com/tor/dist/">http</a></td> <td> - </td> + <td><a href="http://tor.onthegetgo.com/dist/">http</a></td> + <td><a href="http://tor.onthegetgo.com/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -1021,23 +1038,6 @@ <tr> - <td>INT</td> - - <td>CoralCDN</td> - - <td>Unknown</td> - - <td> - </td> - <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> - <td><a href="http://www.torproject.org.nyud.net/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>US</td> <td></td>

1 0

[stem/master] Integ tests resulted in temporary directories
by atagar＠torproject.org 16 May '13

16 May '13

commit 13dc7861ae7bfa280fda8536ca39fcf6135d7b56 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu May 16 09:20:11 2013 -0700 Integ tests resulted in temporary directories Our integ test runner created temporary directories for our control socket but failed to clean them up. On reflection it's simpler for us to use a UUID rather than tempfile.mkdtemp() here so our start() and stop() methods can perform the creation/cleanup. Tested by running our integ tests with a control socket... ./run_tests.py --integ --target RUN_SOCKET ... and confirming both that a temporary resource is made with our control socket and that it's cleaned up afterward. Issue caught thanks to help from Ashish on... https://trac.torproject.org/8622 --- test/runner.py | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/test/runner.py b/test/runner.py index 0ea840a..3614816 100644 --- a/test/runner.py +++ b/test/runner.py @@ -46,6 +46,7 @@ import stat import tempfile import threading import time +import uuid import stem.connection import stem.prereq @@ -79,7 +80,7 @@ INTEG_RUNNER = None # control authentication options and attributes CONTROL_PASSWORD = "pw" CONTROL_PORT = 1111 -CONTROL_SOCKET_PATH = os.path.join(tempfile.mkdtemp(), 'socket') +CONTROL_SOCKET_PATH = os.path.join(tempfile.gettempdir(), str(uuid.uuid4()), 'socket') Torrc = stem.util.enum.Enum( ("PORT", "ControlPort %i" % CONTROL_PORT), @@ -357,6 +358,12 @@ class Runner(object): stem.socket.recv_message = self._original_recv_message self._original_recv_message = None + # clean up our socket directory if we made one + socket_dir = os.path.dirname(CONTROL_SOCKET_PATH) + + if os.path.exists(socket_dir): + shutil.rmtree(socket_dir, ignore_errors = True) + self._test_dir = "" self._tor_cmd = None self._tor_cwd = ""

1 0

[tor-browser/tor-browser-17.0.6esr-1] Tor Browser's official .mozconfigs.
by mikeperry＠torproject.org 16 May '13

16 May '13

commit 7a46578179cfd0965a40e39ada66ec7100a37271 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon May 6 15:51:06 2013 -0700 Tor Browser's official .mozconfigs. --- .mozconfig | 17 +++++++++++++++++ .mozconfig-mingw | 27 +++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 0 deletions(-) diff --git a/.mozconfig b/.mozconfig new file mode 100755 index 0000000..ff722dc --- /dev/null +++ b/.mozconfig @@ -0,0 +1,17 @@ +. $topsrcdir/browser/config/mozconfig + +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ +mk_add_options MOZ_APP_DISPLAYNAME=TorBrowser +mk_add_options MOZ_MAKE_FLAGS="-s --no-print-directory -j4" +mk_add_options MOZILLA_OFFICIAL=1 +mk_add_options BUILD_OFFICIAL=1 + +ac_add_options --enable-optimize +#ac_add_options --disable-optimize +ac_add_options --enable-official-branding +ac_add_options --enable-strip +ac_add_options --disable-tests +ac_add_options --disable-debug +ac_add_options --disable-maintenance-service +ac_add_options --disable-crashreporter +ac_add_options --disable-webrtc diff --git a/.mozconfig-mingw b/.mozconfig-mingw new file mode 100644 index 0000000..27755ed --- /dev/null +++ b/.mozconfig-mingw @@ -0,0 +1,27 @@ +#Specify the cross compile +export CROSS_COMPILE=1 +export MIDL=/usr/bin/i686-w64-mingw32-widl + +ac_add_options --enable-application=browser +ac_add_options --target=i686-w64-mingw32 +ac_add_options --enable-default-toolkit=cairo-windows +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-mingw +mk_add_options MOZ_APP_DISPLAYNAME=TorBrowser +mk_add_options MOZ_MAKE_FLAGS="-s --no-print-directory -j4" +mk_add_options MOZILLA_OFFICIAL=1 +mk_add_options BUILD_OFFICIAL=1 + +ac_add_options --disable-debug +ac_add_options --enable-optimize +ac_add_options --enable-strip +ac_add_options --enable-official-branding + +ac_add_options --disable-updater +ac_add_options --disable-crashreporter +ac_add_options --disable-maintenance-service +ac_add_options --disable-webrtc +ac_add_options --disable-tests + +# XXX: We need to fix both of these: +ac_add_options --disable-webgl +ac_add_options --disable-accessibility

1 0

[tor-browser/tor-browser-17.0.6esr-1] Fix build issues with MinGW.
by mikeperry＠torproject.org 16 May '13

16 May '13

commit 215b178a0542efaa4954c746de0050488bbc9b27 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Apr 29 23:52:48 2013 -0700 Fix build issues with MinGW. Still need to fix WebGL+DirectX. --- accessible/public/ia2/Makefile.in | 10 +++++----- accessible/public/msaa/Makefile.in | 8 ++++---- accessible/public/msaa/nsIWinAccessNode.idl | 2 +- accessible/src/msaa/AccessibleWrap.cpp | 2 +- accessible/src/msaa/HyperTextAccessibleWrap.h | 2 +- accessible/src/msaa/nsAccessNodeWrap.h | 4 ++-- browser/installer/package-manifest.in | 6 +++--- configure.in | 1 + js/src/configure.in | 1 + .../src/common/windows/guid_string.h | 2 +- widget/windows/nsWindow.h | 2 +- 11 files changed, 21 insertions(+), 19 deletions(-) diff --git a/accessible/public/ia2/Makefile.in b/accessible/public/ia2/Makefile.in index 504c2c0..32e272a 100644 --- a/accessible/public/ia2/Makefile.in +++ b/accessible/public/ia2/Makefile.in @@ -73,11 +73,11 @@ EMBED_MANIFEST_AT = 2 include $(topsrcdir)/config/rules.mk OS_LIBS = \ - kernel32.lib \ - rpcns4.lib \ - rpcrt4.lib \ - ole32.lib \ - oleaut32.lib \ + -lkernel32 \ + -lrpcns4 \ + -lrpcrt4 \ + -lole32 \ + -loleaut32 \ $(NULL) # generate list of to-be-generated files that are missing diff --git a/accessible/public/msaa/Makefile.in b/accessible/public/msaa/Makefile.in index 2055ad2..df60e49 100644 --- a/accessible/public/msaa/Makefile.in +++ b/accessible/public/msaa/Makefile.in @@ -52,10 +52,10 @@ MIDL_GENERATED_FILES = \ SRCDIR_CSRCS = $(addprefix $(srcdir)/,$(CSRCS)) OS_LIBS = \ - kernel32.lib \ - rpcns4.lib \ - rpcrt4.lib \ - oleaut32.lib \ + -lkernel32 \ + -lrpcns4 \ + -lrpcrt4 \ + -loleaut32 \ $(NULL) $(MIDL_GENERATED_FILES): done_gen diff --git a/accessible/public/msaa/nsIWinAccessNode.idl b/accessible/public/msaa/nsIWinAccessNode.idl index 133d784..e129030 100644 --- a/accessible/public/msaa/nsIWinAccessNode.idl +++ b/accessible/public/msaa/nsIWinAccessNode.idl @@ -7,7 +7,7 @@ #include "nsISupports.idl" %{C++ -#include "Guiddef.h" +#include "guiddef.h" %} [ref] native MSCOMIIDRef(IID); diff --git a/accessible/src/msaa/AccessibleWrap.cpp b/accessible/src/msaa/AccessibleWrap.cpp index 08470c9..a3fad2c 100644 --- a/accessible/src/msaa/AccessibleWrap.cpp +++ b/accessible/src/msaa/AccessibleWrap.cpp @@ -40,7 +40,7 @@ #include "Accessible2_i.c" #include "AccessibleRole.h" #include "AccessibleStates.h" -#include "OLEACC.H" +#include "oleacc.h" using namespace mozilla; using namespace mozilla::a11y; diff --git a/accessible/src/msaa/HyperTextAccessibleWrap.h b/accessible/src/msaa/HyperTextAccessibleWrap.h index 9e87071..1699f6c 100644 --- a/accessible/src/msaa/HyperTextAccessibleWrap.h +++ b/accessible/src/msaa/HyperTextAccessibleWrap.h @@ -10,7 +10,7 @@ #include "HyperTextAccessible.h" #include "ia2AccessibleEditableText.h" -#include "ia2AccessibleHyperText.h" +#include "ia2AccessibleHypertext.h" class HyperTextAccessibleWrap : public HyperTextAccessible, public ia2AccessibleHypertext, diff --git a/accessible/src/msaa/nsAccessNodeWrap.h b/accessible/src/msaa/nsAccessNodeWrap.h index 33a4ca9..16749a8 100644 --- a/accessible/src/msaa/nsAccessNodeWrap.h +++ b/accessible/src/msaa/nsAccessNodeWrap.h @@ -25,8 +25,8 @@ #include "nsIDOMElement.h" #include "nsIContent.h" #include "nsAccessNode.h" -#include "OLEIDL.H" -#include "OLEACC.H" +#include "oleidl.h" +#include "oleacc.h" #include <winuser.h> #ifdef MOZ_CRASHREPORTER #include "nsICrashReporter.h" diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index 391e093..7b24967 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -40,9 +40,9 @@ @BINPATH@/hyphenation/* @BINPATH@/@PREF_DIR@/firefox-l10n.js @BINPATH@/searchplugins/* -#ifdef XP_WIN32 -@BINPATH@/uninstall/helper.exe -#endif +;#ifdef XP_WIN32 +;@BINPATH@/uninstall/helper.exe +;#endif #ifdef MOZ_UPDATER @BINPATH@/update.locale @BINPATH@/updater.ini diff --git a/configure.in b/configure.in index 63c7bdb..552b8d9 100644 --- a/configure.in +++ b/configure.in @@ -2240,6 +2240,7 @@ ia64*-hpux*) if test -n "$GNU_CC"; then CFLAGS="$CFLAGS -mstackrealign -fno-keep-inline-dllexport" CXXFLAGS="$CXXFLAGS -mstackrealign -fno-keep-inline-dllexport" + LDFLAGS="$LDFLAGS -Wl,--enable-stdcall-fixup -Wl,--large-address-aware" else AC_DEFINE(HAVE_STDCALL) DSO_LDOPTS="$DSO_LDOPTS -MACHINE:X86" diff --git a/js/src/configure.in b/js/src/configure.in index e5962d6..bca3ff3 100644 --- a/js/src/configure.in +++ b/js/src/configure.in @@ -1871,6 +1871,7 @@ ia64*-hpux*) if test -n "$GNU_CC"; then CFLAGS="$CFLAGS -mstackrealign -fno-keep-inline-dllexport" CXXFLAGS="$CXXFLAGS -mstackrealign -fno-keep-inline-dllexport" + LDFLAGS="$LDFLAGS -Wl,--large-address-aware" else DSO_LDOPTS="$DSO_LDOPTS -MACHINE:X86" fi diff --git a/toolkit/crashreporter/google-breakpad/src/common/windows/guid_string.h b/toolkit/crashreporter/google-breakpad/src/common/windows/guid_string.h index f8aa8a2..57716e5 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/windows/guid_string.h +++ b/toolkit/crashreporter/google-breakpad/src/common/windows/guid_string.h @@ -32,7 +32,7 @@ #ifndef COMMON_WINDOWS_GUID_STRING_H__ #define COMMON_WINDOWS_GUID_STRING_H__ -#include <Guiddef.h> +#include <guiddef.h> #include <string> diff --git a/widget/windows/nsWindow.h b/widget/windows/nsWindow.h index dde77bf..32af401 100644 --- a/widget/windows/nsWindow.h +++ b/widget/windows/nsWindow.h @@ -33,7 +33,7 @@ #include "TaskbarWindowPreview.h" #ifdef ACCESSIBILITY -#include "OLEACC.H" +#include "oleacc.h" #include "mozilla/a11y/Accessible.h" #endif

1 0

[tor-browser/tor-browser-17.0.6esr-1] Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 16 May '13

16 May '13

commit 6e3c06724e812b07d81bdd2b90d580909edc8763 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon May 6 15:52:50 2013 -0700 Tor Browser's Firefox preference overrides. This hack directly includes our preference changes in omni.ja. --- browser/app/Makefile.in | 1 + browser/app/profile/000-tor-browser.js | 124 ++++++++++++++++++++++++++++++++ browser/installer/package-manifest.in | 1 + toolkit/mozapps/installer/packager.mk | 2 +- 4 files changed, 127 insertions(+), 1 deletions(-) diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in index 5f891ca..d8bc784 100644 --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in @@ -18,6 +18,7 @@ endif PREF_JS_EXPORTS = $(srcdir)/profile/firefox.js \ $(NULL) +PREF_JS_EXPORTS += $(srcdir)/profile/000-tor-browser.js # hardcode en-US for the moment diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js new file mode 100644 index 0000000..e49c950 --- /dev/null +++ b/browser/app/profile/000-tor-browser.js @@ -0,0 +1,124 @@ +# Default Preferences +# Tor Browser Bundle +# Do not edit this file. + +// Disable browser auto updaters and associated homepage notifications +pref("app.update.auto", false); +pref("app.update.enabled", false); +pref("browser.search.update", false); +pref("browser.rights.3.shown", true); +pref("browser.startup.homepage_override.mstone", "ignore"); +pref("startup.homepage_welcome_url", ""); +pref("startup.homepage_override_url", ""); + +// Disk activity: Disable Browsing History Storage +pref("browser.privatebrowsing.autostart", true); +pref("browser.cache.disk.enable", false); +pref("browser.cache.offline.enable", false); +pref("dom.indexedDB.enabled", false); +pref("permissions.memory_only", true); +pref("network.cookie.lifetimePolicy", 2); +pref("browser.download.manager.retention", 1); + +// Disk activity: TBB Directory Isolation +pref("browser.download.useDownloadDir", false); +pref("browser.shell.checkDefaultBrowser", false); +pref("browser.download.manager.addToRecentDocs", false); + +// Misc privacy: Disk +pref("signon.rememberSignons", false); +pref("browser.formfill.enable", false); +pref("signon.autofillForms", false); +pref("browser.sessionstore.privacy_level", 2); + +// Misc privacy: Remote +pref("browser.send_pings", false); +pref("geo.enabled", false); +pref("geo.wifi.uri", ""); +pref("browser.search.suggest.enabled", false); +pref("browser.safebrowsing.enabled", false); +pref("browser.safebrowsing.malware.enabled", false); + +// Fingerprinting +pref("webgl.min_capability_mode", true); +pref("webgl.disable-extensions", true); +pref("dom.battery.enabled", false); // fingerprinting due to differing OS implementations +pref("dom.network.enabled",false); // fingerprinting due to differing OS implementations +pref("browser.display.max_font_attempts",10); +pref("browser.display.max_font_count",10); +pref("gfx.downloadable_fonts.fallback_delay", -1); +pref("general.appname.override", "Netscape"); +pref("general.appversion.override", "5.0 (Windows)"); +pref("general.buildID.override", "0"); +pref("general.oscpu.override", "Windows NT 6.1"); +pref("general.platform.override", "Win32"); +pref("general.productSub.override", "20100101"); +pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:17.0) Gecko/20100101 Firefox/17.0"); +pref("general.useragent.vendor", ""); +pref("general.useragent.vendorSub", ""); +pref("dom.enable_performance", false); +pref("plugin.expose_full_path", false); +pref("browser.startup.homepage_override.buildID", "20110325121920"); +pref("browser.startup.homepage_override.mstone", "rv:2.0"); +pref("browser.zoom.siteSpecific", false); +// pref("intl.accept_languages", "en-us, en"); // Set by Torbutton +// pref("intl.accept_charsets", "iso-8859-1,*,utf-8"); // Set by Torbutton +// pref("intl.charsetmenu.browser.cache", "UTF-8"); // Set by Torbutton + +// Third party stuff +pref("network.cookie.cookieBehavior", 1); +pref("security.enable_tls_session_tickets", false); +pref("network.http.spdy.enabled", false); // Stores state and may have keepalive issues (both fixable) +pref("network.http.spdy.enabled.v2", false); // Seems redundant, but just in case +pref("network.http.spdy.enabled.v3", false); // Seems redundant, but just in case + +// Proxy and proxy security +pref("network.proxy.socks", "127.0.0.1"); +pref("network.proxy.socks_port", 9150); +pref("network.proxy.socks_remote_dns", true); +pref("network.proxy.type", 1); +pref("network.security.ports.banned", "8118,8123,9050,9051,9150,9151"); +pref("network.dns.disablePrefetch", true); +pref("network.protocol-handler.external-default", false); +pref("network.protocol-handler.external.mailto", false); +pref("network.protocol-handler.external.news", false); +pref("network.protocol-handler.external.nntp", false); +pref("network.protocol-handler.external.snews", false); +pref("network.protocol-handler.warn-external.mailto", true); +pref("network.protocol-handler.warn-external.news", true); +pref("network.protocol-handler.warn-external.nntp", true); +pref("network.protocol-handler.warn-external.snews", true); +pref("plugins.click_to_play", true); + +// Network and performance +pref("network.http.pipelining", true); +pref("network.http.pipelining.aggressive", true); +pref("network.http.pipelining.maxrequests", 12); +pref("network.http.pipelining.ssl", true); +pref("network.http.proxy.pipelining", true); +pref("security.ssl.enable_false_start", true); +pref("network.http.keep-alive.timeout", 20); +pref("network.http.connection-retry-timeout", 0); +pref("network.http.max-persistent-connections-per-proxy", 256); +pref("network.http.pipelining.reschedule-timeout", 15000); +pref("network.http.pipelining.read-timeout", 60000); +// Hacked pref: Now means "Attempt to pipeline at least this many requests together" +pref("network.http.pipelining.max-optimistic-requests", 3); + +// Extension support +pref("extensions.autoDisableScopes", 0); +pref("extensions.bootstrappedAddons", "{}"); +pref("extensions.checkCompatibility.4.*", false); +pref("extensions.databaseSchema", 3); +pref("extensions.enabledAddons", "https-everywhere%40eff.org:3.1.4,%7B73a6fe31-595d-460b-a920-fcc0f8843232%7D:2.6.6.1,torbutton%40torproject.org:1.5.2,ubufox%40ubuntu.com:2.6,tor-launcher%40torproject.org:0.1.1pre-alpha,%7B972ce4c6-7e08-4474-a285-3208198ce6fd%7D:17.0.5"); +pref("extensions.enabledItems", "langpack-en-US@firefox.mozilla.org:,{73a6fe31-595d-460b-a920-fcc0f8843232}:1.9.9.57,{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}:1.2.4,{972ce4c6-7e08-4474-a285-3208198ce6fd}:3.5.8"); +pref("extensions.enabledScopes", 1); +pref("extensions.pendingOperations", false); +pref("xpinstall.whitelist.add", ""); +pref("xpinstall.whitelist.add.36", ""); + +// Omnibox settings +pref("keyword.URL", "https://startpage.com/do/search?q="); + +// Version placeholder +pref("torbrowser.version", "UNKNOWN"); diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index 7b24967..753597c 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -570,6 +570,7 @@ @BINPATH@/@PREF_DIR@/channel-prefs.js #endif @BINPATH@/defaults/profile/prefs.js +@BINPATH@/@PREF_DIR@/000-tor-browser.js ; [Layout Engine Resources] ; Style Sheets, Graphics and other Resources used by the layout engine. diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk index 8460c91..6963e8b 100644 --- a/toolkit/mozapps/installer/packager.mk +++ b/toolkit/mozapps/installer/packager.mk @@ -496,7 +496,7 @@ OMNIJAR_FILES = \ $(NULL) # defaults/pref/channel-prefs.js is handled separate from other prefs due to -# bug 756325 +# bug 756325. NON_OMNIJAR_FILES += \ chrome/icons/\* \ $(PREF_DIR)/channel-prefs.js \

1 0

[oonib/master] Update initialize.sh script for MLAB deployment
by isis＠torproject.org 15 May '13

15 May '13

commit c02b4a1770ed965067980f277e9d22a2671d9ddb Author: aagbsn <aagbsn(a)extc.org> Date: Tue May 14 20:20:51 2013 +0000 Update initialize.sh script for MLAB deployment * Sets the UID and GID to drop privileges to in oonib.conf * Randomly selects either the tcp or http helper service to bind on port 80 * Removes the iptables rules that are no longer needed. --- scripts/init/initialize.sh | 39 +++++++++++++++++++++------------------ 1 files changed, 21 insertions(+), 18 deletions(-) diff --git a/scripts/init/initialize.sh b/scripts/init/initialize.sh index c15fdc5..3196f16 100755 --- a/scripts/init/initialize.sh +++ b/scripts/init/initialize.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # 1. Fetch any dependencies # we should have everything in the virtualenv? Or do we need to also get some @@ -28,35 +28,38 @@ openssl x509 -req -days 365 -in server.csr -signkey private.key -out certificate rm private.key.org rm cert.pass -# Set up our firewall rules -# XXX: Confirm that sudo will work with MLAB. -# Map port 80 to config.helpers.http_return_request.port (default: 57001) -sudo iptables -t nat -A PREROUTING -p tcp -m tcp --dport 80 -j REDIRECT --to-ports 57001 -# Map port 443 to config.helpers.ssl.port (default: 57006) -sudo iptables -t nat -A PREROUTING -p tcp -m tcp --dport 443 -j REDIRECT --to-ports 57006 -# Map port 53 udp to config.helpers.dns.udp_port (default: 57004) -sudo iptables -t nat -A PREROUTING -p udp -m udp --dport 53 -j REDIRECT --to-ports 57004 -# Map port 53 tcp to config.helpers.dns.tcp_port (default: 57005) -sudo iptables -t nat -A PREROUTING -p tcp -m tcp --dport 53 -j REDIRECT --to-ports 57005 +# get the UID and GID to drop privileges to +OONIB_UID=`id -u $SLICENAME` +OONIB_GID=`id -g $SLICENAME` + +# randomly select either a tcp backend helper or a http backend helper to listen on port 80. Otherwise, bind to port 81 +coin=$[$RANDOM % 2] +if [[ $coin > 0 ]]; then + TCP_ECHO_PORT=80 + HTTP_ECHO_PORT=81 +else + TCP_ECHO_PORT=81 + HTTP_ECHO_PORT=80 +fi # drop a config in $SCRIPT_ROOT echo " main: report_dir: '/var/spool/$SLICENAME' tor_datadir: - database_uri: 'sqlite:"$SCRIPT_ROOT"//oonib_test_db.db' + database_uri: 'sqlite://"$SCRIPT_ROOT"/oonib_test_db.db' db_threadpool_size: 10 tor_binary: '"$SCRIPT_ROOT"/bin/tor' tor2webmode: true pidfile: 'oonib.pid' - nodaemon: true + nodaemon: false originalname: Null chroot: Null rundir: . umask: Null euid: Null - uid: Null - gid: Null + uid: $OONIB_UID + gid: $OONIB_GID uuid: Null no_save: true profile: Null @@ -64,11 +67,11 @@ main: helpers: http_return_request: - port: 57001 + port: $HTTP_ECHO_PORT server_version: Apache tcp_echo: - port: 57002 + port: $TCP_ECHO_PORT daphn3: yaml_file: Null @@ -82,4 +85,4 @@ helpers: ssl: private_key: '"$SCRIPT_ROOT"/private.key' certificate: '"$SCRIPT_ROOT"/certificate.crt' - port: 57006" > $SCRIPT_ROOT/oonib.conf + port: 443" > $SCRIPT_ROOT/oonib.conf

1 0

[oonib/master] Make it not look like we're shouting in the README.
by isis＠torproject.org 15 May '13

15 May '13

commit 65c5ad9453edccc37e3e7ae09e3a5aeb92c6369e Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 15 22:52:11 2013 +0000 Make it not look like we're shouting in the README. --- README.md | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index c093568..75b60a9 100644 --- a/README.md +++ b/README.md @@ -87,7 +87,7 @@ this would simply be ```'report'```) and ```tor_datadir``` (where you would like the spawned Tor process to keep its data). If you compiled Tor yourself, you'll likely want to specify it for the ```tor_binary``` option. -## Generate self signed certs for OONIB +### Generate self signed certs for OONIB If you want to use the HTTPS test helper, you will need to create a certificate: ``` @@ -104,7 +104,7 @@ rm server.csr If you decide to put your certificate and key somewhere else, don't forget to update oonib.conf options ```helpers.ssl.private_key``` and ```helpers.ssl.certificate``` ! -## Redirect low ports with iptables +### Redirect low ports with iptables The following iptables commands will map connections on low ports to those bound by oonib: @@ -119,7 +119,7 @@ iptables -t nat -A PREROUTING -p tcp -m udp --dport 53 -j REDIRECT --tor-ports iptables -t nat -A PREROUTING -p tcp -m tcp --dport 53 -j REDIRECT --tor-ports ``` -# (For Experts Only) Tor2webmode: +### (For Experts Only) Tor2webmode: **WARNING**: provides no anonymity! Use only if you know what you are doing! Tor2webmode will improve the performance of the collector Hidden Service by discarding server-side anonymity. @@ -174,7 +174,7 @@ Build Tor with enable-tor2web-mode Copy the tor binary from src/or/tor somewhere and set the corresponding options in oonib.conf. -# To launch oonib on system boot +## To launch oonib on system boot To launch oonib on startup, you may want to use supervisord (www.supervisord.org) The following supervisord config will use the virtual environment in /home/ooni/venv_oonib and start oonib on boot: @@ -187,7 +187,7 @@ user=oonib directory=/home/oonib/ ``` -# Testing with vagrant +## Testing with vagrant To test the deployment of oonib you may use [vagrant](http://www.vagrantup.com).

1 0

[oonib/master] Merge remote-tracking branch 'aagbsn/master'
by isis＠torproject.org 15 May '13

15 May '13

commit 37e11506e5e9161a2a06b8fab9d2272a1f68b105 Merge: 65c5ad9 c02b4a1 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 15 22:52:53 2013 +0000 Merge remote-tracking branch 'aagbsn/master' * Closes PR#2 scripts/init/initialize.sh | 39 +++++++++++++++++++++------------------ 1 files changed, 21 insertions(+), 18 deletions(-)

1 0

[oonib/master] Merge branch 'develop'
by isis＠torproject.org 15 May '13

15 May '13

commit 4efed91ea4fd5bf4b0eab6564188b57b9393cbd3 Merge: 03dc532 7ab522e Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 15 22:41:36 2013 +0000 Merge branch 'develop' * Add comments explaining dependencies in requirements.txt. * Add specific required version to pysqlite dependency. requirements.txt | 33 +++++++++++++++++++++++++++++---- 1 files changed, 29 insertions(+), 4 deletions(-)

1 0

[oonib/master] Specify pysqlite>=2.6.0, and add information on using oonib without SQLite.
by isis＠torproject.org 15 May '13

15 May '13

commit 7ab522e8ac399bef847203585957a5740e9b543b Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 15 22:40:06 2013 +0000 Specify pysqlite>=2.6.0, and add information on using oonib without SQLite. --- requirements.txt | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/requirements.txt b/requirements.txt index 471433f..b0d7f75 100644 --- a/requirements.txt +++ b/requirements.txt @@ -40,4 +40,11 @@ pyOpenSSL>=0.13 zope.component>=4.0.0 zope.event>=4.0.0 zope.interface>=4.0.1 -pysqlite +## +## pysqlite2 is required for sqlite support in Storm, see +## https://storm.canonical.com/Manual#Dependencies-2 +## +## If not installed, Storm and ooni-backend will still work, but will keep an +## in-memory database, which in some cases may slow the server. +## +pysqlite>=2.6.0

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits May 2013