September 2013 - tor-commits - lists.torproject.org

[tor/master] fix: sandbox_intern_string log clean up
by nickm＠torproject.org 13 Sep '13

13 Sep '13

commit ed4968315ec5d0f9c41317bef5468f9019e435b9 Author: Cristian Toader <cristian.matei.toader(a)gmail.com> Date: Wed Aug 21 13:43:44 2013 +0300 fix: sandbox_intern_string log clean up --- src/common/sandbox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 7ff0fb0..3fb75ef 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -658,7 +658,7 @@ sandbox_intern_string(const char *param) } } - log_warn(LD_BUG, "(Sandbox) Parameter %s not found", param); + log_info(LD_GENERAL, "(Sandbox) Parameter %s not found", param); return param; }

1 0

[tor/master] small open syscall modification (just in case)
by nickm＠torproject.org 13 Sep '13

13 Sep '13

commit b10472f92bfe6f4f6c60b70b270df71d1fb95d76 Author: Cristian Toader <cristian.matei.toader(a)gmail.com> Date: Wed Aug 21 19:01:01 2013 +0300 small open syscall modification (just in case) --- src/common/sandbox.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/sandbox.c b/src/common/sandbox.c index a4a93db..e026c7c 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -126,7 +126,7 @@ static int filter_nopar_gen[] = { SCMP_SYS(recvfrom), SCMP_SYS(sendto), SCMP_SYS(send), - SCMP_SYS(unlink) // ? + SCMP_SYS(unlink) }; static int @@ -264,7 +264,7 @@ sb_open(scmp_filter_ctx ctx, sandbox_cfg_t *filter) } // problem: required by getaddrinfo - rc = seccomp_rule_add(ctx, SCMP_ACT_ERRNO(1), SCMP_SYS(open), 1, + rc = seccomp_rule_add(ctx, SCMP_ACT_ERRNO(-1), SCMP_SYS(open), 1, SCMP_CMP(1, SCMP_CMP_EQ, O_RDONLY|O_CLOEXEC)); if (rc != 0) { log_err(LD_BUG,"(Sandbox) failed to add open syscall, received libseccomp "

1 0

[tor/master] fix: accept4 for 64 bit
by nickm＠torproject.org 13 Sep '13

13 Sep '13

commit 15d420b564d00891a9a9a388cfb187aff8a89d3b Author: Cristian Toader <cristian.matei.toader(a)gmail.com> Date: Mon Aug 26 20:06:46 2013 +0300 fix: accept4 for 64 bit --- src/common/sandbox.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/common/sandbox.c b/src/common/sandbox.c index e026c7c..79a8930 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -181,8 +181,23 @@ sb_time(scmp_filter_ctx ctx, sandbox_cfg_t *filter) static int sb_accept4(scmp_filter_ctx ctx, sandbox_cfg_t *filter) { - return seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(socketcall), 1, - SCMP_CMP(0, SCMP_CMP_EQ, 18)); + int rc = 0; + +#ifdef __i386__ + rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(socketcall), 1, + SCMP_CMP(0, SCMP_CMP_EQ, 18)); + if (rc) { + return rc; + } +#endif + + rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(accept4), 1, + SCMP_CMP(3, SCMP_CMP_EQ, SOCK_CLOEXEC)); + if (rc) { + return rc; + } + + return 0; } #ifdef __NR_mmap2

1 0

[torbrowser/master] Linux: add missing geoip file path
by erinn＠torproject.org 13 Sep '13

13 Sep '13

commit 89d664cf1d7e277cc9f83b7de4eea2f54fda6ab9 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Sep 13 17:46:05 2013 +0200 Linux: add missing geoip file path --- build-scripts/config/alpha/torrc-linux | 1 + 1 file changed, 1 insertion(+) diff --git a/build-scripts/config/alpha/torrc-linux b/build-scripts/config/alpha/torrc-linux index aea57fd..56d4928 100644 --- a/build-scripts/config/alpha/torrc-linux +++ b/build-scripts/config/alpha/torrc-linux @@ -2,6 +2,7 @@ AvoidDiskWrites 1 # Store working data, state, keys, and caches here. DataDirectory ./Data/Tor +GeoIPFile ./Data/Tor/geoip GeoIPv6File ./Data/Tor/geoip6 # Where to send logging messages. Format is minSeverity[-maxSeverity] # (stderr|stdout|syslog|file FILENAME).

1 0

[torbrowser/master] begin updating changelogs and READMEs for pending 2.3.25-13 and 2.4.17-beta-2 releases
by erinn＠torproject.org 13 Sep '13

13 Sep '13

commit 2a9b75b7400b167ef04bc9ff7e3c30cc163e243f Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Sep 13 17:45:23 2013 +0200 begin updating changelogs and READMEs for pending 2.3.25-13 and 2.4.17-beta-2 releases --- README.LINUX-2.3 | 6 +++--- README.LINUX-2.4 | 4 ++-- README.OSX-2.3 | 4 ++-- README.OSX-2.4 | 4 ++-- README.WIN-2.3 | 6 +++--- README.WIN-2.4 | 4 ++-- build-scripts/linux-alpha.mk | 2 +- build-scripts/linux.mk | 2 +- build-scripts/osx-alpha.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions-alpha.mk | 4 ++-- build-scripts/versions.mk | 6 +++--- build-scripts/windows-alpha.mk | 2 +- build-scripts/windows.mk | 2 +- changelog.linux-2.3 | 9 +++++++++ changelog.linux-2.4 | 9 +++++++++ changelog.osx-2.3 | 9 +++++++++ changelog.osx-2.4 | 9 +++++++++ changelog.windows-2.3 | 9 +++++++++ changelog.windows-2.4 | 9 +++++++++ 20 files changed, 79 insertions(+), 25 deletions(-) diff --git a/README.LINUX-2.3 b/README.LINUX-2.3 index 64db95f..47e5757 100644 --- a/README.LINUX-2.3 +++ b/README.LINUX-2.3 @@ -6,10 +6,10 @@ Included applications Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) -Firefox 17.0.8esr +Firefox 17.0.9esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.7 - |_ HTTPS-Everywhere 3.3.1 + |_ NoScript 2.6.7.1 + |_ HTTPS-Everywhere 3.4.1 Usage ----- diff --git a/README.LINUX-2.4 b/README.LINUX-2.4 index bd24c34..417bbd2 100644 --- a/README.LINUX-2.4 +++ b/README.LINUX-2.4 @@ -6,10 +6,10 @@ Included applications Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.4.17-rc (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) -Firefox 17.0.8esr +Firefox 17.0.9esr \_ Torbutton 1.5.2 |_ NoScript 2.6.7.1 - |_ HTTPS-Everywhere 4.0development.11 + |_ HTTPS-Everywhere 4.0development.12 |_ PDF Viewer 0.8.298 Usage diff --git a/README.OSX-2.3 b/README.OSX-2.3 index c6f70a0..b392eb9 100644 --- a/README.OSX-2.3 +++ b/README.OSX-2.3 @@ -6,9 +6,9 @@ Included applications Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) -Firefox 17.0.8esr +Firefox 17.0.9esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.7 + |_ NoScript 2.6.7.1 |_ HTTPS-Everywhere 3.3.1 Usage diff --git a/README.OSX-2.4 b/README.OSX-2.4 index 3eff280..14b5a73 100644 --- a/README.OSX-2.4 +++ b/README.OSX-2.4 @@ -6,10 +6,10 @@ Included applications Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.4.17-rc (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) -Firefox 17.0.8esr +Firefox 17.0.9esr \_ Torbutton 1.5.2 |_ NoScript 2.6.7.1 - |_ HTTPS-Everywhere 4.0development.11 + |_ HTTPS-Everywhere 4.0development.12 |_ PDF Viewer 0.8.298 Usage diff --git a/README.WIN-2.3 b/README.WIN-2.3 index ba71efd..5822f93 100644 --- a/README.WIN-2.3 +++ b/README.WIN-2.3 @@ -6,10 +6,10 @@ Included applications Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) -Firefox 17.0.8esr +Firefox 17.0.9esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.7 - |_ HTTPS-Everywhere 3.3.1 + |_ NoScript 2.6.7.1 + |_ HTTPS-Everywhere 3.4.1 Usage ----- diff --git a/README.WIN-2.4 b/README.WIN-2.4 index 968b483..801216e 100644 --- a/README.WIN-2.4 +++ b/README.WIN-2.4 @@ -6,10 +6,10 @@ Included applications Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.4.17-rc (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) -Firefox 17.0.8esr +Firefox 17.0.9esr \_ Torbutton 1.5.2 |_ NoScript 2.6.7.1 - |_ HTTPS-Everywhere 4.0development.11 + |_ HTTPS-Everywhere 4.0development.12 |_ PDF Viewer 0.8.298 Usage diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index aea6d05..e257dfc 100644 --- a/build-scripts/linux-alpha.mk +++ b/build-scripts/linux-alpha.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 6000841..6c2f102 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=12 +BUILD_NUM=13 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index 7ad744d..1429c5b 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=i386 -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 12eb827..6ae8081 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=x86_64 -BUILD_NUM=12 +BUILD_NUM=13 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index 3d7d050..088b27c 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -10,11 +10,11 @@ VIDALIA_VER=0.2.21 LIBEVENT_VER=2.0.21-stable TOR_VER=0.2.4.17-rc PIDGIN_VER=2.6.4 -FIREFOX_VER=17.0.8esr +FIREFOX_VER=17.0.9esr MOZBUILD_VER=1.5.1 TORBUTTON_VER=1.5.2 NOSCRIPT_VER=2.6.7.1 -HTTPSEVERYWHERE_VER=4.0development.11 +HTTPSEVERYWHERE_VER=4.0development.12 PDFJS_VER=0.8.298 OBFSPROXY_VER=0.1.4 OTR_VER=3.2.0 diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 1eaac6d..55cd175 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -10,11 +10,11 @@ VIDALIA_VER=0.2.21 LIBEVENT_VER=2.0.21-stable TOR_VER=0.2.3.25 PIDGIN_VER=2.6.4 -FIREFOX_VER=17.0.8esr +FIREFOX_VER=17.0.9esr MOZBUILD_VER=1.5.1 TORBUTTON_VER=1.5.2 -NOSCRIPT_VER=2.6.7 -HTTPSEVERYWHERE_VER=3.3.1 +NOSCRIPT_VER=2.6.7.1 +HTTPSEVERYWHERE_VER=3.4.1 OTR_VER=3.2.0 OBFSPROXY_VER=0.1.4 diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index 56233c4..76bd01e 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=Windows ## Location of required libraries diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index f988e39..41036fc 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=12 +BUILD_NUM=13 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.3 b/changelog.linux-2.3 index f7adaa2..b135779 100644 --- a/changelog.linux-2.3 +++ b/changelog.linux-2.3 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.3.25-13); suite=linux + + * Update Firefox to 17.0.9esr + * Update HTTPS Everywhere to 3.4.1 + * Update NoScript to 2.6.7.1 + * Remove extraneous libevent libraries (closes: #9727) + + -- Erinn Clark <erinn(a)torproject.org> Fri Sep 13 17:03:13 CEST 2013 + Tor Browser Bundle (2.3.25-12); suite=linux * Re-add the locale pref to the Firefox prefs file to allow for localization diff --git a/changelog.linux-2.4 b/changelog.linux-2.4 index fa7da5e..c40c1bc 100644 --- a/changelog.linux-2.4 +++ b/changelog.linux-2.4 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.4.17-beta-2); suite=linux + + * Update Firefox to 17.0.9esr + * Update HTTPS Everywhere to 0.development.12 + * Update NoScript to 2.6.7.1 + * Remove extraneous libevent libraries (closes: #9727) + + -- Erinn Clark <erinn(a)torproject.org> Fri Sep 13 17:03:36 CEST 2013 + Tor Browser Bundle (2.4.17-beta-1); suite=linux * Update Tor to 0.2.4.17-rc diff --git a/changelog.osx-2.3 b/changelog.osx-2.3 index 1cd1f07..2f4c405 100644 --- a/changelog.osx-2.3 +++ b/changelog.osx-2.3 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.3.25-13); suite=osx + + * Update Firefox to 17.0.9esr + * Update HTTPS Everywhere to 3.4.1 + * Update NoScript to 2.6.7.1 + * Remove extraneous libevent libraries (closes: #9727) + + -- Erinn Clark <erinn(a)torproject.org> Fri Sep 13 17:03:11 CEST 2013 + Tor Browser Bundle (2.3.25-12); suite=osx * Re-add the locale pref to the Firefox prefs file to allow for localization diff --git a/changelog.osx-2.4 b/changelog.osx-2.4 index c99d531..062335f 100644 --- a/changelog.osx-2.4 +++ b/changelog.osx-2.4 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.4.17-beta-2); suite=osx + + * Update Firefox to 17.0.9esr + * Update HTTPS Everywhere to 0.development.12 + * Update NoScript to 2.6.7.1 + * Remove extraneous libevent libraries (closes: #9727) + + -- Erinn Clark <erinn(a)torproject.org> Fri Sep 13 17:03:38 CEST 2013 + Tor Browser Bundle (2.4.17-beta-1); suite=osx * Update Tor to 0.2.4.17-rc diff --git a/changelog.windows-2.3 b/changelog.windows-2.3 index 793c0d6..a0475fc 100644 --- a/changelog.windows-2.3 +++ b/changelog.windows-2.3 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.3.25-13); suite=windows + + * Update Firefox to 17.0.9esr + * Update HTTPS Everywhere to 3.4.1 + * Update NoScript to 2.6.7.1 + * Remove extraneous libevent libraries (closes: #9727) + + -- Erinn Clark <erinn(a)torproject.org> Fri Sep 13 17:03:15 CEST 2013 + Tor Browser Bundle (2.3.25-12); suite=windows * Re-add the locale pref to the Firefox prefs file to allow for localization diff --git a/changelog.windows-2.4 b/changelog.windows-2.4 index 4c7881d..b23efb7 100644 --- a/changelog.windows-2.4 +++ b/changelog.windows-2.4 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.4.17-beta-2); suite=windows + + * Update Firefox to 17.0.9esr + * Update HTTPS Everywhere to 0.development.12 + * Update NoScript to 2.6.7.1 + * Remove extraneous libevent libraries (closes: #9727) + + -- Erinn Clark <erinn(a)torproject.org> Fri Sep 13 17:03:34 CEST 2013 + Tor Browser Bundle (2.4.17-beta-1); suite=windows * Update Tor to 0.2.4.17-rc

1 0

[torbrowser/maint-2.4] remove extraneous libevent libraries. closes: #9727
by erinn＠torproject.org 13 Sep '13

13 Sep '13

commit 207b41254eabc122367b242e1ccef4d1c8953b29 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Sep 13 17:46:43 2013 +0200 remove extraneous libevent libraries. closes: #9727 --- build-scripts/linux-alpha.mk | 5 +---- build-scripts/linux.mk | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index e257dfc..073207b 100644 --- a/build-scripts/linux-alpha.mk +++ b/build-scripts/linux-alpha.mk @@ -265,10 +265,7 @@ install-binaries: # zlib cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.8 $(LIBSDIR)/libz # Libevent - cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.1.9 $(LIBEVENT)/libevent_core.so \ - $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.1.9 \ - $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.1.9 \ - $(LIBEVENT)/libevent_extra.so $(LIBEVENT)/libevent.so $(LIBSDIR) + cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.1.9 $(LIBEVENT)/libevent.so $(LIBSDIR) # libpng cp -d $(LIBPNG)/libpng15.so* $(LIBSDIR) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 6c2f102..d6c2bdc 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -247,10 +247,7 @@ install-binaries: # zlib cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.8 $(LIBSDIR)/libz # Libevent - cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.1.9 $(LIBEVENT)/libevent_core.so \ - $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.1.9 \ - $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.1.9 \ - $(LIBEVENT)/libevent_extra.so $(LIBEVENT)/libevent.so $(LIBSDIR) + cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.1.9 $(LIBEVENT)/libevent.so $(LIBSDIR) # libpng cp -d $(LIBPNG)/libpng15.so* $(LIBSDIR)

1 0

[torbrowser/maint-2.4] Linux: add missing geoip file path
by erinn＠torproject.org 13 Sep '13

13 Sep '13

commit 86ab70c39c0ebb619920606929d833655ca1f95c Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Sep 13 17:46:05 2013 +0200 Linux: add missing geoip file path --- build-scripts/config/alpha/torrc-linux | 1 + 1 file changed, 1 insertion(+) diff --git a/build-scripts/config/alpha/torrc-linux b/build-scripts/config/alpha/torrc-linux index aea57fd..56d4928 100644 --- a/build-scripts/config/alpha/torrc-linux +++ b/build-scripts/config/alpha/torrc-linux @@ -2,6 +2,7 @@ AvoidDiskWrites 1 # Store working data, state, keys, and caches here. DataDirectory ./Data/Tor +GeoIPFile ./Data/Tor/geoip GeoIPv6File ./Data/Tor/geoip6 # Where to send logging messages. Format is minSeverity[-maxSeverity] # (stderr|stdout|syslog|file FILENAME).

1 0

[torbrowser/maint-2.4] begin updating changelogs and READMEs for pending 2.3.25-13 and 2.4.17-beta-2 releases
by erinn＠torproject.org 13 Sep '13

13 Sep '13

commit 79706edc293afaeeb71d306695f2ecfcedd03287 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Sep 13 17:45:23 2013 +0200 begin updating changelogs and READMEs for pending 2.3.25-13 and 2.4.17-beta-2 releases --- README.LINUX-2.3 | 6 +++--- README.LINUX-2.4 | 4 ++-- README.OSX-2.3 | 4 ++-- README.OSX-2.4 | 4 ++-- README.WIN-2.3 | 6 +++--- README.WIN-2.4 | 4 ++-- build-scripts/linux-alpha.mk | 2 +- build-scripts/linux.mk | 2 +- build-scripts/osx-alpha.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions-alpha.mk | 4 ++-- build-scripts/versions.mk | 6 +++--- build-scripts/windows-alpha.mk | 2 +- build-scripts/windows.mk | 2 +- changelog.linux-2.3 | 9 +++++++++ changelog.linux-2.4 | 9 +++++++++ changelog.osx-2.3 | 9 +++++++++ changelog.osx-2.4 | 9 +++++++++ changelog.windows-2.3 | 9 +++++++++ changelog.windows-2.4 | 9 +++++++++ 20 files changed, 79 insertions(+), 25 deletions(-) diff --git a/README.LINUX-2.3 b/README.LINUX-2.3 index 64db95f..47e5757 100644 --- a/README.LINUX-2.3 +++ b/README.LINUX-2.3 @@ -6,10 +6,10 @@ Included applications Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) -Firefox 17.0.8esr +Firefox 17.0.9esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.7 - |_ HTTPS-Everywhere 3.3.1 + |_ NoScript 2.6.7.1 + |_ HTTPS-Everywhere 3.4.1 Usage ----- diff --git a/README.LINUX-2.4 b/README.LINUX-2.4 index bd24c34..417bbd2 100644 --- a/README.LINUX-2.4 +++ b/README.LINUX-2.4 @@ -6,10 +6,10 @@ Included applications Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.4.17-rc (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) -Firefox 17.0.8esr +Firefox 17.0.9esr \_ Torbutton 1.5.2 |_ NoScript 2.6.7.1 - |_ HTTPS-Everywhere 4.0development.11 + |_ HTTPS-Everywhere 4.0development.12 |_ PDF Viewer 0.8.298 Usage diff --git a/README.OSX-2.3 b/README.OSX-2.3 index c6f70a0..b392eb9 100644 --- a/README.OSX-2.3 +++ b/README.OSX-2.3 @@ -6,9 +6,9 @@ Included applications Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) -Firefox 17.0.8esr +Firefox 17.0.9esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.7 + |_ NoScript 2.6.7.1 |_ HTTPS-Everywhere 3.3.1 Usage diff --git a/README.OSX-2.4 b/README.OSX-2.4 index 3eff280..14b5a73 100644 --- a/README.OSX-2.4 +++ b/README.OSX-2.4 @@ -6,10 +6,10 @@ Included applications Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.4.17-rc (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) -Firefox 17.0.8esr +Firefox 17.0.9esr \_ Torbutton 1.5.2 |_ NoScript 2.6.7.1 - |_ HTTPS-Everywhere 4.0development.11 + |_ HTTPS-Everywhere 4.0development.12 |_ PDF Viewer 0.8.298 Usage diff --git a/README.WIN-2.3 b/README.WIN-2.3 index ba71efd..5822f93 100644 --- a/README.WIN-2.3 +++ b/README.WIN-2.3 @@ -6,10 +6,10 @@ Included applications Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) -Firefox 17.0.8esr +Firefox 17.0.9esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.7 - |_ HTTPS-Everywhere 3.3.1 + |_ NoScript 2.6.7.1 + |_ HTTPS-Everywhere 3.4.1 Usage ----- diff --git a/README.WIN-2.4 b/README.WIN-2.4 index 968b483..801216e 100644 --- a/README.WIN-2.4 +++ b/README.WIN-2.4 @@ -6,10 +6,10 @@ Included applications Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.4.17-rc (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) -Firefox 17.0.8esr +Firefox 17.0.9esr \_ Torbutton 1.5.2 |_ NoScript 2.6.7.1 - |_ HTTPS-Everywhere 4.0development.11 + |_ HTTPS-Everywhere 4.0development.12 |_ PDF Viewer 0.8.298 Usage diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index aea6d05..e257dfc 100644 --- a/build-scripts/linux-alpha.mk +++ b/build-scripts/linux-alpha.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 6000841..6c2f102 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=12 +BUILD_NUM=13 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index 7ad744d..1429c5b 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=i386 -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 12eb827..6ae8081 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=x86_64 -BUILD_NUM=12 +BUILD_NUM=13 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index 3d7d050..088b27c 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -10,11 +10,11 @@ VIDALIA_VER=0.2.21 LIBEVENT_VER=2.0.21-stable TOR_VER=0.2.4.17-rc PIDGIN_VER=2.6.4 -FIREFOX_VER=17.0.8esr +FIREFOX_VER=17.0.9esr MOZBUILD_VER=1.5.1 TORBUTTON_VER=1.5.2 NOSCRIPT_VER=2.6.7.1 -HTTPSEVERYWHERE_VER=4.0development.11 +HTTPSEVERYWHERE_VER=4.0development.12 PDFJS_VER=0.8.298 OBFSPROXY_VER=0.1.4 OTR_VER=3.2.0 diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 1eaac6d..55cd175 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -10,11 +10,11 @@ VIDALIA_VER=0.2.21 LIBEVENT_VER=2.0.21-stable TOR_VER=0.2.3.25 PIDGIN_VER=2.6.4 -FIREFOX_VER=17.0.8esr +FIREFOX_VER=17.0.9esr MOZBUILD_VER=1.5.1 TORBUTTON_VER=1.5.2 -NOSCRIPT_VER=2.6.7 -HTTPSEVERYWHERE_VER=3.3.1 +NOSCRIPT_VER=2.6.7.1 +HTTPSEVERYWHERE_VER=3.4.1 OTR_VER=3.2.0 OBFSPROXY_VER=0.1.4 diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index 56233c4..76bd01e 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=Windows ## Location of required libraries diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index f988e39..41036fc 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=12 +BUILD_NUM=13 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.3 b/changelog.linux-2.3 index f7adaa2..b135779 100644 --- a/changelog.linux-2.3 +++ b/changelog.linux-2.3 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.3.25-13); suite=linux + + * Update Firefox to 17.0.9esr + * Update HTTPS Everywhere to 3.4.1 + * Update NoScript to 2.6.7.1 + * Remove extraneous libevent libraries (closes: #9727) + + -- Erinn Clark <erinn(a)torproject.org> Fri Sep 13 17:03:13 CEST 2013 + Tor Browser Bundle (2.3.25-12); suite=linux * Re-add the locale pref to the Firefox prefs file to allow for localization diff --git a/changelog.linux-2.4 b/changelog.linux-2.4 index fa7da5e..c40c1bc 100644 --- a/changelog.linux-2.4 +++ b/changelog.linux-2.4 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.4.17-beta-2); suite=linux + + * Update Firefox to 17.0.9esr + * Update HTTPS Everywhere to 0.development.12 + * Update NoScript to 2.6.7.1 + * Remove extraneous libevent libraries (closes: #9727) + + -- Erinn Clark <erinn(a)torproject.org> Fri Sep 13 17:03:36 CEST 2013 + Tor Browser Bundle (2.4.17-beta-1); suite=linux * Update Tor to 0.2.4.17-rc diff --git a/changelog.osx-2.3 b/changelog.osx-2.3 index 1cd1f07..2f4c405 100644 --- a/changelog.osx-2.3 +++ b/changelog.osx-2.3 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.3.25-13); suite=osx + + * Update Firefox to 17.0.9esr + * Update HTTPS Everywhere to 3.4.1 + * Update NoScript to 2.6.7.1 + * Remove extraneous libevent libraries (closes: #9727) + + -- Erinn Clark <erinn(a)torproject.org> Fri Sep 13 17:03:11 CEST 2013 + Tor Browser Bundle (2.3.25-12); suite=osx * Re-add the locale pref to the Firefox prefs file to allow for localization diff --git a/changelog.osx-2.4 b/changelog.osx-2.4 index c99d531..062335f 100644 --- a/changelog.osx-2.4 +++ b/changelog.osx-2.4 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.4.17-beta-2); suite=osx + + * Update Firefox to 17.0.9esr + * Update HTTPS Everywhere to 0.development.12 + * Update NoScript to 2.6.7.1 + * Remove extraneous libevent libraries (closes: #9727) + + -- Erinn Clark <erinn(a)torproject.org> Fri Sep 13 17:03:38 CEST 2013 + Tor Browser Bundle (2.4.17-beta-1); suite=osx * Update Tor to 0.2.4.17-rc diff --git a/changelog.windows-2.3 b/changelog.windows-2.3 index 793c0d6..a0475fc 100644 --- a/changelog.windows-2.3 +++ b/changelog.windows-2.3 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.3.25-13); suite=windows + + * Update Firefox to 17.0.9esr + * Update HTTPS Everywhere to 3.4.1 + * Update NoScript to 2.6.7.1 + * Remove extraneous libevent libraries (closes: #9727) + + -- Erinn Clark <erinn(a)torproject.org> Fri Sep 13 17:03:15 CEST 2013 + Tor Browser Bundle (2.3.25-12); suite=windows * Re-add the locale pref to the Firefox prefs file to allow for localization diff --git a/changelog.windows-2.4 b/changelog.windows-2.4 index 4c7881d..b23efb7 100644 --- a/changelog.windows-2.4 +++ b/changelog.windows-2.4 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.4.17-beta-2); suite=windows + + * Update Firefox to 17.0.9esr + * Update HTTPS Everywhere to 0.development.12 + * Update NoScript to 2.6.7.1 + * Remove extraneous libevent libraries (closes: #9727) + + -- Erinn Clark <erinn(a)torproject.org> Fri Sep 13 17:03:34 CEST 2013 + Tor Browser Bundle (2.4.17-beta-1); suite=windows * Update Tor to 0.2.4.17-rc

1 0

[torbrowser/master] remove extraneous libevent libraries. closes: #9727
by erinn＠torproject.org 13 Sep '13

13 Sep '13

commit 7d4f648afc711ada9e06805585e3a07473c29264 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Sep 13 17:46:43 2013 +0200 remove extraneous libevent libraries. closes: #9727 --- build-scripts/linux-alpha.mk | 5 +---- build-scripts/linux.mk | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index e257dfc..073207b 100644 --- a/build-scripts/linux-alpha.mk +++ b/build-scripts/linux-alpha.mk @@ -265,10 +265,7 @@ install-binaries: # zlib cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.8 $(LIBSDIR)/libz # Libevent - cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.1.9 $(LIBEVENT)/libevent_core.so \ - $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.1.9 \ - $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.1.9 \ - $(LIBEVENT)/libevent_extra.so $(LIBEVENT)/libevent.so $(LIBSDIR) + cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.1.9 $(LIBEVENT)/libevent.so $(LIBSDIR) # libpng cp -d $(LIBPNG)/libpng15.so* $(LIBSDIR) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 6c2f102..d6c2bdc 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -247,10 +247,7 @@ install-binaries: # zlib cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.8 $(LIBSDIR)/libz # Libevent - cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.1.9 $(LIBEVENT)/libevent_core.so \ - $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.1.9 \ - $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.1.9 \ - $(LIBEVENT)/libevent_extra.so $(LIBEVENT)/libevent.so $(LIBSDIR) + cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.1.9 $(LIBEVENT)/libevent.so $(LIBSDIR) # libpng cp -d $(LIBPNG)/libpng15.so* $(LIBSDIR)

1 0

[tor-launcher/master] Bug #9675: Provide feedback mechanism for clock-skew and other bad problems
by brade＠torproject.org 13 Sep '13

13 Sep '13

commit 8a64ec3b07e2bfe82ab47401993f52f4ec5b0163 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Sep 13 10:38:22 2013 -0400 Bug #9675: Provide feedback mechanism for clock-skew and other bad problems If a tor error or warning message is received by Tor Launcher, add a caution icon to the "Open Settings" and "Copy Tor Log to Clipboard" buttons. --- src/chrome/content/network-settings.js | 35 ++++++++++++++++++++------------ src/chrome/content/progress.js | 11 ++++++++++ src/chrome/skin/network-settings.css | 9 ++++++++ src/chrome/skin/progress.css | 9 ++++++++ src/chrome/skin/warning.png | Bin 0 -> 2190 bytes 5 files changed, 51 insertions(+), 13 deletions(-) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index c9e43ce..573393d 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -22,7 +22,7 @@ const kTorProcessReadyTopic = "TorProcessIsReady"; const kTorProcessExitedTopic = "TorProcessExited"; const kTorProcessDidNotStartTopic = "TorProcessDidNotStart"; const kTorBootstrapErrorTopic = "TorBootstrapError"; -const kTorLogHasWarnOrErr = "TorLogHasWarnOrErr"; +const kTorLogHasWarnOrErrTopic = "TorLogHasWarnOrErr"; const kWizardProxyRadioGroup = "proxyRadioGroup"; const kWizardFirewallRadioGroup = "firewallRadioGroup"; @@ -120,7 +120,7 @@ function initDialog() if (gTorProcessService.TorBootstrapErrorOccurred || gProtocolSvc.TorLogHasWarnOrErr) { - wizardShowCopyLogButton(); + showCopyLogButton(true); } // Use "Connect" as the finish button label (on the last wizard page).. @@ -143,7 +143,7 @@ function initDialog() } gObsService.addObserver(gObserver, kTorBootstrapErrorTopic, false); - gObsService.addObserver(gObserver, kTorLogHasWarnOrErr, false); + gObsService.addObserver(gObserver, kTorLogHasWarnOrErrTopic, false); if (TorLauncherUtil.shouldStartAndOwnTor && !gTorProcessService.TorIsProcessReady) @@ -216,9 +216,10 @@ function showWizardNavButtons(aShow) var gObserver = { observe: function(aSubject, aTopic, aData) { - if ((kTorBootstrapErrorTopic == aTopic) || (kTorLogHasWarnOrErr == aTopic)) + if ((kTorBootstrapErrorTopic == aTopic) || + (kTorLogHasWarnOrErrTopic == aTopic)) { - wizardShowCopyLogButton(); + showCopyLogButton(true); return; } @@ -296,20 +297,28 @@ function showPanel(aPanelID) function showErrorPanel() { - showPanel("errorPanel"); - wizardShowCopyLogButton(); + showPanel("errorPanel"); + var haveErrorOrWarning = (gTorProcessService.TorBootstrapErrorOccurred || + gProtocolSvc.TorLogHasWarnOrErr) + showCopyLogButton(haveErrorOrWarning); } -function wizardShowCopyLogButton() +function showCopyLogButton(aHaveErrorOrWarning) { - if (getWizard()) + var copyLogBtn = document.documentElement.getButton("extra2"); + if (copyLogBtn) { - var copyLogBtn = document.documentElement.getButton("extra2"); - if (copyLogBtn) - { + if (getWizard()) copyLogBtn.setAttribute("wizardCanCopyLog", true); - copyLogBtn.removeAttribute("hidden"); + + copyLogBtn.removeAttribute("hidden"); + + if (aHaveErrorOrWarning) + { + var clz = copyLogBtn.getAttribute("class"); + copyLogBtn.setAttribute("class", clz ? clz + " torWarning" + : "torWarning"); } } } diff --git a/src/chrome/content/progress.js b/src/chrome/content/progress.js index 3a40dbf..6a826e0 100644 --- a/src/chrome/content/progress.js +++ b/src/chrome/content/progress.js @@ -9,6 +9,7 @@ const Cu = Components.utils; const kTorProcessExitedTopic = "TorProcessExited"; const kBootstrapStatusTopic = "TorBootstrapStatus"; +const kTorLogHasWarnOrErrTopic = "TorLogHasWarnOrErr"; Cu.import("resource://gre/modules/XPCOMUtils.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherUtil", @@ -26,6 +27,7 @@ function initDialog() .getService(Ci.nsIObserverService); gObsSvc.addObserver(gObserver, kTorProcessExitedTopic, false); gObsSvc.addObserver(gObserver, kBootstrapStatusTopic, false); + gObsSvc.addObserver(gObserver, kTorLogHasWarnOrErrTopic, false); } catch (e) {} @@ -68,6 +70,7 @@ function cleanup() { gObsSvc.removeObserver(gObserver, kTorProcessExitedTopic); gObsSvc.removeObserver(gObserver, kBootstrapStatusTopic); + gObsSvc.removeObserver(gObserver, kTorLogHasWarnOrErrTopic); } } @@ -155,5 +158,13 @@ var gObserver = { if (labelText && desc) desc.textContent = labelText; } + else if (kTorLogHasWarnOrErrTopic == aTopic) + { + var extra2Btn = document.documentElement.getButton("extra2"); + var clz = extra2Btn.getAttribute("class"); + extra2Btn.setAttribute("class", clz ? clz + " torWarning" : "torWarning"); + + // TODO: show error / warning message in this dialog? + } }, }; diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index 4c51e4a..1d92151 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -128,3 +128,12 @@ dialog .help { { font-size: 120%; } + +.torWarning { + list-style-image: url("chrome://torlauncher/skin/warning.png"); +} + +/* Ensure that our caution icon is always shown on GTK-based platforms. */ +.torWarning .button-icon { + display: inline !important; +} diff --git a/src/chrome/skin/progress.css b/src/chrome/skin/progress.css index 671870f..711a679 100644 --- a/src/chrome/skin/progress.css +++ b/src/chrome/skin/progress.css @@ -33,3 +33,12 @@ dialog { #progressMeter { margin-bottom: 16px; } + +.torWarning { + list-style-image: url("chrome://torlauncher/skin/warning.png"); +} + +/* Ensure that our caution icon is always shown on GTK-based platforms. */ +.torWarning .button-icon { + display: inline !important; +} diff --git a/src/chrome/skin/warning.png b/src/chrome/skin/warning.png new file mode 100644 index 0000000..da90d1a Binary files /dev/null and b/src/chrome/skin/warning.png differ

1 0