- tor-commits - lists.torproject.org

[torbirdy/master] Merge pull request #26 from arthuredelstein/6314
by sukhbir＠torproject.org 02 May '16

02 May '16

commit bfa822de6071e894dad3d5c59e4fdf2ebacd91e2 Merge: 19cc1c7 7169642 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Thu Dec 10 22:00:00 2015 -0500 Merge pull request #26 from arthuredelstein/6314 Bug #6314: Round Date header down to nearest minute. components/torbirdy.js | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)

1 0

[torbirdy/master] Allow changing the default protocol (#15879)
by sukhbir＠torproject.org 02 May '16

02 May '16

commit 04fd3d875491a0fdcc598c43c53edc0eb384e4cf Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon May 2 14:49:52 2016 -0400 Allow changing the default protocol (#15879) --- chrome/content/emailwizard.js | 3 +++ defaults/preferences/prefs.js | 1 + 2 files changed, 4 insertions(+) diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js index 2f2a6a7..123753b 100644 --- a/chrome/content/emailwizard.js +++ b/chrome/content/emailwizard.js @@ -144,6 +144,9 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { document.getElementById("provisioner_button").disabled = true; document.getElementById("provisioner_button").hidden = true; } + // 0 is for POP3 (default), 1 is for IMAP. See emailwizard.xul and prefs.js. + var selectProtocol = prefs.getIntPref("extensions.torbirdy.defaultprotocol") + document.getElementById("torbirdy-protocol").selectedIndex = selectProtocol; }; return pub; diff --git a/defaults/preferences/prefs.js b/defaults/preferences/prefs.js index eec4539..8b43562 100644 --- a/defaults/preferences/prefs.js +++ b/defaults/preferences/prefs.js @@ -10,3 +10,4 @@ pref("extensions.torbirdy.whonix_run", true); pref("extensions.torbirdy.info_run", false); pref("extensions.torbirdy.emailwizard", false); pref("extensions.torbirdy.fetchall", false); +pref("extensions.torbirdy.defaultprotocol", 0); // 0 - POP3, 1 - IMAP

1 0

[tor/master] (cherry-picked by nickm, with changes file from isis.)
by nickm＠torproject.org 02 May '16

02 May '16

commit 054d9398531b148d8b41c382da36c83c0381e09e Author: s0rlxmh0 <s6yg1ez3(a)mail2tor.com> Date: Mon May 2 14:01:36 2016 -0400 (cherry-picked by nickm, with changes file from isis.) --- changes/bug18920 | 5 +++++ src/or/control.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/changes/bug18920 b/changes/bug18920 new file mode 100644 index 0000000..1babfd6 --- /dev/null +++ b/changes/bug18920 @@ -0,0 +1,5 @@ + o Minor bugfixes (controller, microdescriptors): + - Make GETINFO dir/status-vote/current/consensus conform to the control + specification by returning "551 Could not open cached consensus..." + when not caching consensuses. + Fixes bug 18920; bugfix on 0.2.2.6-alpha. diff --git a/src/or/control.c b/src/or/control.c index 655b4dd..e06d7d2 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2011,6 +2011,11 @@ getinfo_helper_dir(control_connection_t *control_conn, char *filename = get_datadir_fname("cached-consensus"); *answer = read_file_to_str(filename, RFTS_IGNORE_MISSING, NULL); tor_free(filename); + if (!*answer) { /* generate an error */ + *errmsg = "Could not open cached consensus. " + "Make sure FetchUselessDescriptors is set to 1."; + return -1; + } } } else if (!strcmp(question, "network-status")) { /* v1 */ routerlist_t *routerlist = router_get_routerlist();

1 0

[tor/master] Merge branch 'maint-0.2.8'
by nickm＠torproject.org 02 May '16

02 May '16

commit 8340becd39920ef6363ab6c7d494cc7abf70c202 Merge: b2083cb 054d939 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 2 14:02:15 2016 -0400 Merge branch 'maint-0.2.8' changes/bug18920 | 5 +++++ src/or/control.c | 5 +++++ 2 files changed, 10 insertions(+)

1 0

[tor/maint-0.2.8] (cherry-picked by nickm, with changes file from isis.)
by nickm＠torproject.org 02 May '16

02 May '16

commit 054d9398531b148d8b41c382da36c83c0381e09e Author: s0rlxmh0 <s6yg1ez3(a)mail2tor.com> Date: Mon May 2 14:01:36 2016 -0400 (cherry-picked by nickm, with changes file from isis.) --- changes/bug18920 | 5 +++++ src/or/control.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/changes/bug18920 b/changes/bug18920 new file mode 100644 index 0000000..1babfd6 --- /dev/null +++ b/changes/bug18920 @@ -0,0 +1,5 @@ + o Minor bugfixes (controller, microdescriptors): + - Make GETINFO dir/status-vote/current/consensus conform to the control + specification by returning "551 Could not open cached consensus..." + when not caching consensuses. + Fixes bug 18920; bugfix on 0.2.2.6-alpha. diff --git a/src/or/control.c b/src/or/control.c index 655b4dd..e06d7d2 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2011,6 +2011,11 @@ getinfo_helper_dir(control_connection_t *control_conn, char *filename = get_datadir_fname("cached-consensus"); *answer = read_file_to_str(filename, RFTS_IGNORE_MISSING, NULL); tor_free(filename); + if (!*answer) { /* generate an error */ + *errmsg = "Could not open cached consensus. " + "Make sure FetchUselessDescriptors is set to 1."; + return -1; + } } } else if (!strcmp(question, "network-status")) { /* v1 */ routerlist_t *routerlist = router_get_routerlist();

1 0

[tor/master] Increase number of preemptive internal circuits
by nickm＠torproject.org 02 May '16

02 May '16

commit 1e553b6c68b5bffeda07dea5b5adcac9730013dd Author: David Goulet <dgoulet(a)ev0ke.net> Date: Tue Apr 19 14:23:12 2016 -0400 Increase number of preemptive internal circuits When we connect to a hidden service as a client we may need three internal circuits, one for the descriptor retrieval, introduction, and rendezvous. Let's try to make sure we have them. Closes #13239. Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- changes/bug13239 | 4 ++++ src/or/circuituse.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug13239 b/changes/bug13239 new file mode 100644 index 0000000..17030c9 --- /dev/null +++ b/changes/bug13239 @@ -0,0 +1,4 @@ + o Minor bugfixes (hidden service client): + - Increase the minimum number of internal circuits we preemptively build + from 2 to 3 so they are available when a client connects to another + onion service. Fixes bug 13239; bugfix on tor-0.1.0.1-rc~460. diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 31003ea..b595994 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1067,7 +1067,7 @@ circuit_predict_and_launch_new(void) if (rep_hist_get_predicted_internal(now, &hidserv_needs_uptime, &hidserv_needs_capacity) && ((num_uptime_internal<2 && hidserv_needs_uptime) || - num_internal<2) + num_internal<3) && router_have_consensus_path() != CONSENSUS_PATH_UNKNOWN) { if (hidserv_needs_uptime) flags |= CIRCLAUNCH_NEED_UPTIME;

1 0

[tor/master] Merge remote-tracking branch 'dgoulet/bug13239_029_01'
by nickm＠torproject.org 02 May '16

02 May '16

commit b2083cba9eb842ae7e85063d5751ddddc7302acb Merge: c9081bd 1e553b6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 2 13:55:00 2016 -0400 Merge remote-tracking branch 'dgoulet/bug13239_029_01' changes/bug13239 | 4 ++++ src/or/circuituse.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/master] Clean up TEST_TOR_BINARY so test-stem can have better dependencies
by nickm＠torproject.org 02 May '16

02 May '16

commit a57ed38a8ecc17ac83b5d303fa449173a6792d97 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 5 11:47:37 2016 -0400 Clean up TEST_TOR_BINARY so test-stem can have better dependencies Fix #18240. This version of the bug first appeared in 0.2.8.2-alpha. 0.2.8.1-alpha and earlier had a different bug. Based on a patch from cypherpunks. --- Makefile.am | 16 ++++++++-------- changes/bug18240 | 5 +++++ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/Makefile.am b/Makefile.am index 92ba2b8..3c80290 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,9 +19,9 @@ AM_CFLAGS = @TOR_SYSTEMD_CFLAGS@ SHELL = @SHELL@ if COVERAGE_ENABLED -TESTING_TOR_BINARY="$(top_builddir)/src/or/tor-cov" +TESTING_TOR_BINARY=$(top_builddir)/src/or/tor-cov$(EXEEXT) else -TESTING_TOR_BINARY="$(top_builddir)/src/or/tor" +TESTING_TOR_BINARY=$(top_builddir)/src/or/tor$(EXEEXT) endif include src/include.am @@ -93,7 +93,7 @@ need-chutney-path: # Note that test-network requires a copy of Chutney in $CHUTNEY_PATH. # Chutney can be cloned from https://git.torproject.org/chutney.git . -test-network: need-chutney-path all +test-network: need-chutney-path $(TESTING_TOR_BINARY) src/tools/tor-gencert $(top_srcdir)/src/test/test-network.sh $(TEST_NETWORK_FLAGS) # Run all available tests using automake's test-driver @@ -101,7 +101,7 @@ test-network: need-chutney-path all # some IPv6 tests will fail without an IPv6 DNS server (see #16971 and #17011) # only run mixed tests if we have a tor-stable binary # see #17015 for autodetection of different tor versions -test-network-all: need-chutney-path all test-driver +test-network-all: need-chutney-path test-driver $(TESTING_TOR_BINARY) src/tools/tor-gencert mkdir -p $(TEST_NETWORK_ALL_LOG_DIR) @flavors="$(TEST_CHUTNEY_FLAVORS)"; \ if ping6 -q -o ::1 >/dev/null 2>&1; then \ @@ -134,11 +134,11 @@ need-stem-path: exit 1; \ fi -test-stem: need-stem-path all - @$(PYTHON) "$$STEM_SOURCE_DIR"/run_tests.py --tor $(TESTING_TOR_BINARY) --all --log notice --target RUN_ALL; +test-stem: need-stem-path $(TESTING_TOR_BINARY) + @$(PYTHON) "$$STEM_SOURCE_DIR"/run_tests.py --tor "$(TESTING_TOR_BINARY)" --all --log notice --target RUN_ALL; -test-stem-full: need-stem-path all - @$(PYTHON) "$$STEM_SOURCE_DIR"/run_tests.py --tor $(TESTING_TOR_BINARY) --all --log notice --target RUN_ALL,ONLINE -v; +test-stem-full: need-stem-path $(TESTING_TOR_BINARY) + @$(PYTHON) "$$STEM_SOURCE_DIR"/run_tests.py --tor "$(TESTING_TOR_BINARY)" --all --log notice --target RUN_ALL,ONLINE -v; test-full: need-stem-path need-chutney-path check test-network test-stem diff --git a/changes/bug18240 b/changes/bug18240 new file mode 100644 index 0000000..6be7ba1 --- /dev/null +++ b/changes/bug18240 @@ -0,0 +1,5 @@ + o Minor bugfixes (build): + - Make the test-stem and test-network targets depend only on the + tor binary to be tested. Previously, they depended on "make all". + Fixes bug 18240; bugfix on 0.2.8.2-alpha. + Based on a patch from "cypherpunks".

1 0

[tor/master] Merge branch 'bug18240_squashed'
by nickm＠torproject.org 02 May '16

02 May '16

commit c9081bdb74a459f5cf4d6a03ec6619b1bd5e89e8 Merge: b72aa18 a57ed38 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 2 13:53:37 2016 -0400 Merge branch 'bug18240_squashed' Makefile.am | 16 ++++++++-------- changes/bug18240 | 5 +++++ 2 files changed, 13 insertions(+), 8 deletions(-)

1 0

[tor/master] test_bt.sh: Check stderr for backtrace as well as stdout.
by nickm＠torproject.org 02 May '16

02 May '16

commit b72aa18d73869563e88b85930408781495deed2c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 2 12:58:58 2016 -0400 test_bt.sh: Check stderr for backtrace as well as stdout. addresssanitizer likes to put backtraces on stderr. --- changes/bug18934 | 3 +++ src/test/test_bt.sh | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/bug18934 b/changes/bug18934 new file mode 100644 index 0000000..fba703e --- /dev/null +++ b/changes/bug18934 @@ -0,0 +1,3 @@ + o Minor features (testing): + - Let backtrace tests work correctly under AddressSanitizer. + Fixes part of bug 18934. diff --git a/src/test/test_bt.sh b/src/test/test_bt.sh index 033acac..83fa3ff 100755 --- a/src/test/test_bt.sh +++ b/src/test/test_bt.sh @@ -4,7 +4,7 @@ exitcode=0 "${builddir:-.}/src/test/test-bt-cl" backtraces || exit $? -"${builddir:-.}/src/test/test-bt-cl" assert | "${PYTHON:-python}" "${abs_top_srcdir:-.}/src/test/bt_test.py" || exitcode="$?" -"${builddir:-.}/src/test/test-bt-cl" crash | "${PYTHON:-python}" "${abs_top_srcdir:-.}/src/test/bt_test.py" || exitcode="$?" +"${builddir:-.}/src/test/test-bt-cl" assert 2>&1 | "${PYTHON:-python}" "${abs_top_srcdir:-.}/src/test/bt_test.py" || exitcode="$?" +"${builddir:-.}/src/test/test-bt-cl" crash 2>&1 | "${PYTHON:-python}" "${abs_top_srcdir:-.}/src/test/bt_test.py" || exitcode="$?" exit ${exitcode}

1 0