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

[torbrowser/master] update READMEs for 2.4.17-rc-1
by erinn＠torproject.org 01 Nov '13

01 Nov '13

commit 9eadcc9b0c7c4e228bc03da1db65b829033e4796 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Oct 31 21:04:34 2013 -0200 update READMEs for 2.4.17-rc-1 --- README.LINUX-2.4 | 6 +++--- README.OSX-2.4 | 6 +++--- README.WIN-2.4 | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.LINUX-2.4 b/README.LINUX-2.4 index 417bbd2..3b1baf3 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.9esr +Firefox 17.0.10esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.7.1 - |_ HTTPS-Everywhere 4.0development.12 + |_ NoScript 2.6.8.4 + |_ HTTPS-Everywhere 3.4.2 |_ PDF Viewer 0.8.298 Usage diff --git a/README.OSX-2.4 b/README.OSX-2.4 index 14b5a73..d395338 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.9esr +Firefox 17.0.10esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.7.1 - |_ HTTPS-Everywhere 4.0development.12 + |_ NoScript 2.6.8.4 + |_ HTTPS-Everywhere 3.4.2 |_ PDF Viewer 0.8.298 Usage diff --git a/README.WIN-2.4 b/README.WIN-2.4 index 801216e..f76f48f 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.9esr +Firefox 17.0.10esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.7.1 - |_ HTTPS-Everywhere 4.0development.12 + |_ NoScript 2.6.8.4 + |_ HTTPS-Everywhere 3.4.2 |_ PDF Viewer 0.8.298 Usage

1 0

[torbrowser/master] Merge branch 'maint-2.4'
by erinn＠torproject.org 01 Nov '13

01 Nov '13

commit 7596949e64511a5727a7d0b76a3c3f57174a5cdf Merge: 1166edb 9eadcc9 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Oct 31 21:04:52 2013 -0200 Merge branch 'maint-2.4' README.LINUX-2.4 | 6 +++--- README.OSX-2.4 | 6 +++--- README.WIN-2.4 | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-)

1 0

[torbrowser/maint-2.4] update READMEs for 2.4.17-rc-1
by erinn＠torproject.org 01 Nov '13

01 Nov '13

commit 9eadcc9b0c7c4e228bc03da1db65b829033e4796 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Oct 31 21:04:34 2013 -0200 update READMEs for 2.4.17-rc-1 --- README.LINUX-2.4 | 6 +++--- README.OSX-2.4 | 6 +++--- README.WIN-2.4 | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.LINUX-2.4 b/README.LINUX-2.4 index 417bbd2..3b1baf3 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.9esr +Firefox 17.0.10esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.7.1 - |_ HTTPS-Everywhere 4.0development.12 + |_ NoScript 2.6.8.4 + |_ HTTPS-Everywhere 3.4.2 |_ PDF Viewer 0.8.298 Usage diff --git a/README.OSX-2.4 b/README.OSX-2.4 index 14b5a73..d395338 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.9esr +Firefox 17.0.10esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.7.1 - |_ HTTPS-Everywhere 4.0development.12 + |_ NoScript 2.6.8.4 + |_ HTTPS-Everywhere 3.4.2 |_ PDF Viewer 0.8.298 Usage diff --git a/README.WIN-2.4 b/README.WIN-2.4 index 801216e..f76f48f 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.9esr +Firefox 17.0.10esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.7.1 - |_ HTTPS-Everywhere 4.0development.12 + |_ NoScript 2.6.8.4 + |_ HTTPS-Everywhere 3.4.2 |_ PDF Viewer 0.8.298 Usage

1 0

[tor-browser-bundle/master] Work around a HTTPS-Everywhere build reproducibility issue.
by mikeperry＠torproject.org 01 Nov '13

01 Nov '13

commit f8998987409e2c3b8ba747c17b7bf0ff95f7b08b Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Oct 31 15:18:30 2013 -0700 Work around a HTTPS-Everywhere build reproducibility issue. https://trac.torproject.org/projects/tor/ticket/10066 --- gitian/descriptors/linux/gitian-bundle.yml | 3 +++ gitian/descriptors/mac/gitian-bundle.yml | 3 +++ gitian/descriptors/windows/gitian-bundle.yml | 3 +++ 3 files changed, 9 insertions(+) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index 1728358..060f1a4 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -76,6 +76,9 @@ script: | cd ../../../ # cd https-everywhere + # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in + # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 + rm -f .git/refs/heads/master ./makexpi.sh cp ./pkg/*.xpi ../tor-browser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi cd .. diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index 85df0e7..cdf387b 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -74,6 +74,9 @@ script: | cd ../../../ # cd https-everywhere + # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in + # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 + rm -f .git/refs/heads/master ./makexpi.sh cp ./pkg/*.xpi ../TorBrowserBundle.app/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi cd .. diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index abe4549..bb28155 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -74,6 +74,9 @@ script: | cd ../../../ # cd https-everywhere + # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in + # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 + rm -f .git/refs/heads/master ./makexpi.sh cp ./pkg/*.xpi ../tbb-windows-installer/"Tor Browser"/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi cd ..

1 0

[tor-browser-bundle/master] Bump Firefox language pack versions.
by mikeperry＠torproject.org 01 Nov '13

01 Nov '13

commit ce9263422140bafa75fc4f727119d9574db0ab41 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Oct 31 14:32:31 2013 -0700 Bump Firefox language pack versions. --- gitian/versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions b/gitian/versions index a89ff91..02afa2b 100755 --- a/gitian/versions +++ b/gitian/versions @@ -16,7 +16,7 @@ MINGW_REV=5830 GITIAN_TAG=tor-browser-builder-3.0-4 OPENSSL_VER=1.0.1e -FIREFOX_LANG_VER=17.0.9esr +FIREFOX_LANG_VER=17.0.10esr BINUTILS_VER=2.22 GCC_VER=4.6.3

1 0

[tor/master] Merge remote-tracking branch 'public/bug9645' into maint-0.2.4
by nickm＠torproject.org 01 Nov '13

01 Nov '13

commit 5cc155e02a995fda828ff33b105040b2bd96a650 Merge: db2c2a6 264aa27 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 31 16:09:41 2013 -0400 Merge remote-tracking branch 'public/bug9645' into maint-0.2.4 changes/bug9645a | 5 +++++ src/or/microdesc.c | 9 ++++----- 2 files changed, 9 insertions(+), 5 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 01 Nov '13

01 Nov '13

commit dde41fa1b00151e01e11341903069f5b2f0db1b7 Merge: 275ab61 5cc155e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 31 16:10:19 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4'

1 0

[tor/maint-0.2.4] Fix bug 9645: don't forget an md just because we can't save it.
by nickm＠torproject.org 01 Nov '13

01 Nov '13

commit 264aa271a734767a13065bc6e0d15c4d8c602005 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 3 14:25:01 2013 -0400 Fix bug 9645: don't forget an md just because we can't save it. --- changes/bug9645a | 5 +++++ src/or/microdesc.c | 9 ++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/changes/bug9645a b/changes/bug9645a new file mode 100644 index 0000000..2daba65 --- /dev/null +++ b/changes/bug9645a @@ -0,0 +1,5 @@ + o Minor bugfixes: + - If we are unable to save a microdescriptor to the journal, do not + drop it from memory and then reattempt downloading it. Fixes bug + 9645; bugfix on 0.2.2.6-alpha. + diff --git a/src/or/microdesc.c b/src/or/microdesc.c index b93bd83..8b5581f 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -213,7 +213,6 @@ microdescs_add_list_to_cache(microdesc_cache_t *cache, if (fd < 0) { log_warn(LD_DIR, "Couldn't append to journal in %s: %s", cache->journal_fname, strerror(errno)); - return NULL; } } @@ -238,11 +237,11 @@ microdescs_add_list_to_cache(microdesc_cache_t *cache, if (size < 0) { /* we already warned in dump_microdescriptor */ abort_writing_to_file(open_file); - smartlist_clear(added); - return added; + fd = -1; + } else { + md->saved_location = SAVED_IN_JOURNAL; + cache->journal_len += size; } - md->saved_location = SAVED_IN_JOURNAL; - cache->journal_len += size; } else { md->saved_location = where; }

1 0

[tor/maint-0.2.4] Merge remote-tracking branch 'public/bug9645' into maint-0.2.4
by nickm＠torproject.org 01 Nov '13

01 Nov '13

commit 5cc155e02a995fda828ff33b105040b2bd96a650 Merge: db2c2a6 264aa27 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 31 16:09:41 2013 -0400 Merge remote-tracking branch 'public/bug9645' into maint-0.2.4 changes/bug9645a | 5 +++++ src/or/microdesc.c | 9 ++++----- 2 files changed, 9 insertions(+), 5 deletions(-)

1 0

[tor/master] Appease make check-spaces
by nickm＠torproject.org 01 Nov '13

01 Nov '13

commit 275ab61ad43903fcd13763f8c741225b09ac162c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 31 14:45:20 2013 -0400 Appease make check-spaces --- src/or/circpathbias.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/or/circpathbias.c b/src/or/circpathbias.c index ca8db51..51a75cf 100644 --- a/src/or/circpathbias.c +++ b/src/or/circpathbias.c @@ -1535,3 +1535,4 @@ pathbias_scale_use_rates(entry_guard_t *guard) entry_guards_changed(); } } +

1 0