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

[tor-browser-build/master] Bug 21536: Remove scramblesuit bridge
by boklm＠torproject.org 05 Mar '17

05 Mar '17

commit 51ab48b05f1ab9ea1c60b45e42c9db682c167166 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Feb 23 13:46:14 2017 +0000 Bug 21536: Remove scramblesuit bridge --- projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index c56d316..61e2a9e 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -13,8 +13,6 @@ pref("extensions.torlauncher.default_bridge.fte.2", "fte 128.105.214.161:8080 1E pref("extensions.torlauncher.default_bridge.fte.3", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D"); pref("extensions.torlauncher.default_bridge.fte.4", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); -pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH"); - pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 154.35.22.10:15937 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 198.245.60.50:443 752CF7825B3B9EA6A98C83AC41F7099D67007EA5 cert=xpmQtKUqQ/6v5X7ijgYE/f03+l2/EuQ1dexjyUhh16wQlu/cpXUGalmhDIlhuiQPNEKmKw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 192.99.11.54:443 7B126FAB960E5AC6A629C729434FF84FB5074EC2 cert=VW5f8+IBUWpPFxF+rsiVy2wXkyTQG7vEd+rHeN2jV5LIDNu8wMNEOqZXPwHdwMVEBdqXEw iat-mode=0");

1 0

[tor-browser-build/master] Set TZ and LC_ALL when starting rbm
by boklm＠torproject.org 05 Mar '17

05 Mar '17

commit 51493b7b17da9d4941600f54842d0e1ddb33cf31 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sun Mar 5 18:20:38 2017 +0100 Set TZ and LC_ALL when starting rbm --- rbm | 2 +- rbm.conf | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/rbm b/rbm index b3ca063..1945b67 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit b3ca063713f0d25a66f76c829d750ac977a25207 +Subproject commit 1945b67fefbcf7b834b71275e301da06232f0241 diff --git a/rbm.conf b/rbm.conf index b137595..b2fb21a 100644 --- a/rbm.conf +++ b/rbm.conf @@ -200,3 +200,7 @@ gpg_wrapper: | else exec [% c('gpg_bin') %] [% c('gpg_args') %] --with-fingerprint [% gpg_kr %] "$@" fi + +ENV: + TZ: UTC + LC_ALL: C

1 0

[tor-browser-build/master] Add var/set_default_env and use it in all build scripts
by boklm＠torproject.org 05 Mar '17

05 Mar '17

commit 73c030f1c8a7283d8343ad6ab7401ce4b6ada0ab Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sun Mar 5 18:28:04 2017 +0100 Add var/set_default_env and use it in all build scripts --- projects/binutils/build | 5 ++--- projects/clang/build | 2 +- projects/cmake/build | 3 +-- projects/firefox-langpacks/build | 2 +- projects/firefox/build | 9 +-------- projects/fonts/build | 3 +-- projects/gcc/build | 2 +- projects/gmp/build | 3 +-- projects/go/build | 3 +-- projects/go/config | 3 +-- projects/https-everywhere/build | 4 ++-- projects/libdmg-hfsplus/build | 4 ++-- projects/libevent/build | 3 +-- projects/llvm/build | 3 +-- projects/macosx-toolchain-gcc/build | 3 +-- projects/macosx-toolchain/build | 5 ++--- projects/meek/build | 3 +-- projects/mingw-w64/build | 5 ++--- projects/nsis/build | 5 ++--- projects/obfs4/build | 3 +-- projects/openssl/build | 3 +-- projects/release/config | 3 +-- projects/sandbox/build | 3 +-- projects/tbb-windows-installer/build | 2 +- projects/tor-browser/build | 6 +----- projects/tor-launcher/build | 4 ++-- projects/tor/build | 6 +----- projects/torbutton/build | 4 ++-- projects/zlib/build | 6 +----- rbm.conf | 10 ++++++++++ 30 files changed, 47 insertions(+), 73 deletions(-) diff --git a/projects/binutils/build b/projects/binutils/build index cdd01a6..e3064cf 100644 --- a/projects/binutils/build +++ b/projects/binutils/build @@ -1,6 +1,5 @@ -#!/bin/sh -set -e -rootdir=$(pwd) +#!/bin/bash +[% c("var/set_default_env") -%] distdir=/var/tmp/dist/binutils [% IF c("var/linux") %] # Config options for hardening-wrapper diff --git a/projects/clang/build b/projects/clang/build index 380ca1c..ac0f21b 100644 --- a/projects/clang/build +++ b/projects/clang/build @@ -1,5 +1,5 @@ #!/bin/bash -set -e +[% c("var/set_default_env") -%] tar xf [% project %]-[% c("version") %].tar.gz mv [% project %]-[% c("version") %] [% project %] [% c('tar', { diff --git a/projects/cmake/build b/projects/cmake/build index d59522a..dd5017a 100644 --- a/projects/cmake/build +++ b/projects/cmake/build @@ -1,6 +1,5 @@ #!/bin/bash -set -e -rootdir=$(pwd) +[% c("var/set_default_env") -%] distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz diff --git a/projects/firefox-langpacks/build b/projects/firefox-langpacks/build index 82e5452..9ac07cb 100644 --- a/projects/firefox-langpacks/build +++ b/projects/firefox-langpacks/build @@ -1,5 +1,5 @@ #!/bin/bash -set -e +[% c("var/set_default_env") -%] [% FOREACH lang = c('var/locales') %] [% SET lang = tmpl(lang) %] diff --git a/projects/firefox/build b/projects/firefox/build index 7610510..453f6b3 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -1,6 +1,5 @@ #!/bin/bash -set -e -rootdir=$(pwd) +[% c("var/set_default_env") -%] [% IF c("var/windows") -%] mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/gcc') %] @@ -17,12 +16,6 @@ rootdir=$(pwd) distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/build -export SHELL=/bin/bash -export HOME=$rootdir -export TZ=UTC -export LC_ALL=C -umask 0022 - [% IF c("var/linux") %] tar xf $rootdir/[% c('input_files_by_name/binutils') %] export PATH="/var/tmp/dist/binutils/bin:$PATH" diff --git a/projects/fonts/build b/projects/fonts/build index 4984c3b..e645c31 100644 --- a/projects/fonts/build +++ b/projects/fonts/build @@ -1,6 +1,5 @@ #!/bin/bash -set -e -rootdir=$(pwd) +[% c("var/set_default_env") -%] distdir=/var/tmp/dist/fonts mkdir -p $distdir tar xf [% project %]-[% c("version") %].tar.gz diff --git a/projects/gcc/build b/projects/gcc/build index 03cfcbd..1c24af7 100644 --- a/projects/gcc/build +++ b/projects/gcc/build @@ -1,5 +1,5 @@ #!/bin/sh -set -e +[% c("var/set_default_env") -%] distdir=/var/tmp/dist/[% project %] mkdir /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c("version") %].tar.bz2 diff --git a/projects/gmp/build b/projects/gmp/build index d7b3b14..34173d6 100644 --- a/projects/gmp/build +++ b/projects/gmp/build @@ -1,6 +1,5 @@ #!/bin/bash -set -e -rootdir=$(pwd) +[% c("var/set_default_env") -%] [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/build diff --git a/projects/go/build b/projects/go/build index 2efd928..72117f6 100644 --- a/projects/go/build +++ b/projects/go/build @@ -1,6 +1,5 @@ #!/bin/bash -set -e -rootdir=$(pwd) +[% c("var/set_default_env") -%] distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/dist diff --git a/projects/go/config b/projects/go/config index 9341f98..5e55a09 100644 --- a/projects/go/config +++ b/projects/go/config @@ -20,8 +20,7 @@ var: # a list of install targets. build_go_lib: | #!/bin/bash - set -e - rootdir=$(pwd) + [% c("var/set_default_env") -%] [% pc('go', 'var/setup', { go_tarfile => c('input_files_by_name/go') }) %] distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/build diff --git a/projects/https-everywhere/build b/projects/https-everywhere/build index 6e49e7b..71b2a21 100644 --- a/projects/https-everywhere/build +++ b/projects/https-everywhere/build @@ -1,5 +1,5 @@ -#!/bin/sh -set -e +#!/bin/bash +[% c("var/set_default_env") -%] tar xf [% project %]-[% c('version') %].tar.gz cd [% project %]-[% c('version') %] # patch makexpi.sh because we don't have a git repository diff --git a/projects/libdmg-hfsplus/build b/projects/libdmg-hfsplus/build index 2903150..47a5e43 100644 --- a/projects/libdmg-hfsplus/build +++ b/projects/libdmg-hfsplus/build @@ -1,5 +1,5 @@ -#!/bin/sh -set -e +#!/bin/bash +[% c("var/set_default_env") -%] distdir=$(pwd)/dist mkdir -p $distdir/[% project %] tar xf [% project %]-[% c('version') %].tar.gz diff --git a/projects/libevent/build b/projects/libevent/build index 8aa85fc..2bed816 100644 --- a/projects/libevent/build +++ b/projects/libevent/build @@ -1,6 +1,5 @@ #!/bin/bash -set -e -rootdir=$(pwd) +[% c("var/set_default_env") -%] [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/build diff --git a/projects/llvm/build b/projects/llvm/build index bdf7576..3773cfd 100644 --- a/projects/llvm/build +++ b/projects/llvm/build @@ -1,6 +1,5 @@ #!/bin/bash -set -e -rootdir=$(pwd) +[% c("var/set_default_env") -%] distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %] diff --git a/projects/macosx-toolchain-gcc/build b/projects/macosx-toolchain-gcc/build index 778194d..4a8f0db 100644 --- a/projects/macosx-toolchain-gcc/build +++ b/projects/macosx-toolchain-gcc/build @@ -1,6 +1,5 @@ #!/bin/bash -set -e -rootdir=$(pwd) +[% c("var/set_default_env") -%] destdir='[% dest_dir _ '/' _ c('filename') %]' mkdir -p "$destdir" mv -f [% c('input_files_by_name/SDK') %] "$destdir"/apple-uni-sdk.deb diff --git a/projects/macosx-toolchain/build b/projects/macosx-toolchain/build index b263940..b718023 100644 --- a/projects/macosx-toolchain/build +++ b/projects/macosx-toolchain/build @@ -1,6 +1,5 @@ -#!/bin/sh -set -e -rootdir=$(pwd) +#!/bin/bash +[% c("var/set_default_env") -%] distdir="/var/tmp/dist/[% project %]" mkdir -p "$distdir" tar xzf [% c('input_files_by_name/SDK') %] diff --git a/projects/meek/build b/projects/meek/build index 283066a..8d1beb7 100644 --- a/projects/meek/build +++ b/projects/meek/build @@ -1,6 +1,5 @@ #!/bin/bash -set -e -rootdir=$(pwd) +[% c("var/set_default_env") -%] [% pc('go', 'var/setup', { go_tarfile => c('input_files_by_name/go') }) %] distdir=/var/tmp/dist/[% project %] [% IF c("var/osx") %] diff --git a/projects/mingw-w64/build b/projects/mingw-w64/build index 39361e7..42ee716 100644 --- a/projects/mingw-w64/build +++ b/projects/mingw-w64/build @@ -1,6 +1,5 @@ -#!/bin/sh -set -e -rootdir=$(pwd) +#!/bin/bash +[% c("var/set_default_env") -%] distdir=/var/tmp/dist/[% project %] mkdir /var/tmp/build diff --git a/projects/nsis/build b/projects/nsis/build index 48f1cb1..af19dd7 100755 --- a/projects/nsis/build +++ b/projects/nsis/build @@ -1,6 +1,5 @@ -#!/bin/sh -set -e -rootdir=$(pwd) +#!/bin/bash +[% c("var/set_default_env") -%] [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] # remove hardening wrappers rm -Rf /var/tmp/dist/mingw-w64/helpers diff --git a/projects/obfs4/build b/projects/obfs4/build index ff313e9..61ef481 100644 --- a/projects/obfs4/build +++ b/projects/obfs4/build @@ -1,6 +1,5 @@ #!/bin/bash -set -e -rootdir=$(pwd) +[% c("var/set_default_env") -%] [% pc('go', 'var/setup', { go_tarfile => c('input_files_by_name/go') }) %] distdir=/var/tmp/dist/[% project %] [% IF c("var/osx") %] diff --git a/projects/openssl/build b/projects/openssl/build index acd7bbb..3a5365e 100644 --- a/projects/openssl/build +++ b/projects/openssl/build @@ -1,6 +1,5 @@ #!/bin/bash -set -e -rootdir=$(pwd) +[% c("var/set_default_env") -%] [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/build diff --git a/projects/release/config b/projects/release/config index e2b2eb9..f6712c0 100644 --- a/projects/release/config +++ b/projects/release/config @@ -119,8 +119,7 @@ input_files: build: | #!/bin/sh - set -e - export LC_ALL=C + [% c("var/set_default_env") -%] destdir="[% dest_dir _ '/' _ c("var/publish_dir") %]" mkdir -p "$destdir" [% IF c("var/torbrowser-windows-i686") -%] diff --git a/projects/sandbox/build b/projects/sandbox/build index 28b5a48..8a3edb3 100644 --- a/projects/sandbox/build +++ b/projects/sandbox/build @@ -1,6 +1,5 @@ #!/bin/bash -set -e -rootdir=$(pwd) +[% c("var/set_default_env") -%] [% pc('go', 'var/setup', { go_tarfile => c('input_files_by_name/go') }) %] distdir=/var/tmp/dist/[% project %] mkdir -p $distdir diff --git a/projects/tbb-windows-installer/build b/projects/tbb-windows-installer/build index 380ca1c..ac0f21b 100644 --- a/projects/tbb-windows-installer/build +++ b/projects/tbb-windows-installer/build @@ -1,5 +1,5 @@ #!/bin/bash -set -e +[% c("var/set_default_env") -%] tar xf [% project %]-[% c("version") %].tar.gz mv [% project %]-[% c("version") %] [% project %] [% c('tar', { diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 4eeb350..904f1b6 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -1,11 +1,7 @@ #!/bin/bash -set -e -rootdir=$(pwd) +[% c("var/set_default_env") -%] distdir=/var/tmp/dist/[% project %] -export TZ=UTC -export LC_ALL=C export TORBROWSER_VERSION='[% c("version") %]' -umask 0022 mkdir -p $distdir diff --git a/projects/tor-launcher/build b/projects/tor-launcher/build index 69e01b3..90c5268 100644 --- a/projects/tor-launcher/build +++ b/projects/tor-launcher/build @@ -1,5 +1,5 @@ -#!/bin/sh -set -e +#!/bin/bash +[% c("var/set_default_env") -%] tar xvf [% project %]-[% c('version') %].tar.gz cd [% project %]-[% c('version') %] make package diff --git a/projects/tor/build b/projects/tor/build index f0b57f1..c56cddc 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -1,9 +1,5 @@ #!/bin/bash -set -e -rootdir=$(pwd) -export TZ=UTC -export LC_ALL=C -umask 0022 +[% c("var/set_default_env") -%] [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/build diff --git a/projects/torbutton/build b/projects/torbutton/build index b7a7262..38136c4 100644 --- a/projects/torbutton/build +++ b/projects/torbutton/build @@ -1,5 +1,5 @@ -#!/bin/sh -set -e +#!/bin/bash +[% c("var/set_default_env") -%] tar xvf [% project %]-[% c('version') %].tar.gz cd [% project %]-[% c('version') %] mkdir -p pkg diff --git a/projects/zlib/build b/projects/zlib/build index fdcfbfb..4031ef5 100644 --- a/projects/zlib/build +++ b/projects/zlib/build @@ -1,9 +1,5 @@ #!/bin/bash -set -e -rootdir=$(pwd) -export TZ=UTC -export LC_ALL=C -umask 0022 +[% c("var/set_default_env") -%] [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/build diff --git a/rbm.conf b/rbm.conf index b2fb21a..e5c69b0 100644 --- a/rbm.conf +++ b/rbm.conf @@ -67,6 +67,16 @@ var: mv -f -- "$rezip_tmpdir/new.zip" [% c("rezip_file") %] rm -Rf "$rezip_tmpdir" + set_default_env: | + set -e + [% FOREACH env = c('ENV') -%] + export [% env.key %]="[% env.value %]" + [% END -%] + rootdir=$(pwd) + export SHELL=/bin/bash + export HOME=$rootdir + umask 0022 + targets: notarget: linux-x86_64 noint:

1 0

[tor/master] Merge branch 'feature21598_squashed'
by nickm＠torproject.org 05 Mar '17

05 Mar '17

commit 00d1093daf692b70d21d60f3333296097a01a376 Merge: 958ec0f f24638a Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 4 23:22:46 2017 -0500 Merge branch 'feature21598_squashed' changes/feature21598 | 4 ++++ src/or/rendservice.c | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+)

1 0

[tor/master] Log a message when a hidden service has fewer intro points than expected
by nickm＠torproject.org 05 Mar '17

05 Mar '17

commit f24638aa49bfd127c43f7ba12e91dd278b6f3264 Author: teor <teor2345(a)gmail.com> Date: Thu Mar 2 16:38:21 2017 +1100 Log a message when a hidden service has fewer intro points than expected Closes ticket 21598. --- changes/feature21598 | 4 ++++ src/or/rendservice.c | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/changes/feature21598 b/changes/feature21598 new file mode 100644 index 0000000..317ace4 --- /dev/null +++ b/changes/feature21598 @@ -0,0 +1,4 @@ + o Minor feature (hidden services): + - Log a message when a hidden service descriptor has fewer introduction + points than specified in HiddenServiceNumIntroductionPoints. + Closes ticket 21598. diff --git a/src/or/rendservice.c b/src/or/rendservice.c index cb87624..87a9ccf 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -1080,6 +1080,25 @@ rend_service_update_descriptor(rend_service_t *service) intro_svc->time_published = time(NULL); } } + + /* Check that we have the right number of intro points */ + unsigned int have_intro = (unsigned int)smartlist_len(d->intro_nodes); + if (have_intro != service->n_intro_points_wanted) { + int severity; + /* Getting less than we wanted or more than we're allowed is serious */ + if (have_intro < service->n_intro_points_wanted || + have_intro > NUM_INTRO_POINTS_MAX) { + severity = LOG_WARN; + } else { + /* Getting more than we wanted is weird, but less of a problem */ + severity = LOG_NOTICE; + } + log_fn(severity, LD_REND, "Hidden service %s wanted %d intro points, but " + "descriptor was updated with %d instead.", + service->service_id, + service->n_intro_points_wanted, have_intro); + rend_service_dump_stats(severity); + } } /* Allocate and return a string containing the path to file_name in

1 0

[tor/master] Make hidden services always check for failed intro point connections
by nickm＠torproject.org 05 Mar '17

05 Mar '17

commit 3e2d06bd3d574eb47ec27edcc6832ed9678e7863 Author: teor <teor2345(a)gmail.com> Date: Thu Mar 2 15:33:09 2017 +1100 Make hidden services always check for failed intro point connections Previously, they would stop checking when they exceeded their intro point creation limit. Fixes bug 21596; bugfix on commit d67bf8b2f23 in Tor 0.2.7.2-alpha. Reported by alecmuffett. --- changes/bug21596 | 5 +++++ src/or/rendservice.c | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/changes/bug21596 b/changes/bug21596 new file mode 100644 index 0000000..ec0a46b --- /dev/null +++ b/changes/bug21596 @@ -0,0 +1,5 @@ + o Minor bugfixes (hidden services): + - Make hidden services check for failed intro point connections, even when + they have exceeded their intro point creation limit. Fixes bug 21596; + bugfix on commit d67bf8b2f23 in Tor 0.2.7.2-alpha. Reported by + alecmuffett. diff --git a/src/or/rendservice.c b/src/or/rendservice.c index cb87624..c23d45c 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -4061,6 +4061,10 @@ rend_consider_services_intro_points(void) smartlist_clear(exclude_nodes); smartlist_clear(retry_nodes); + /* Cleanup the invalid intro points and save the node objects, if any, + * in the exclude_nodes and retry_nodes lists. */ + remove_invalid_intro_points(service, exclude_nodes, retry_nodes, now); + /* This retry period is important here so we don't stress circuit * creation. */ if (now > service->intro_period_started + INTRO_CIRC_RETRY_PERIOD) { @@ -4070,14 +4074,10 @@ rend_consider_services_intro_points(void) } else if (service->n_intro_circuits_launched >= MAX_INTRO_CIRCS_PER_PERIOD) { /* We have failed too many times in this period; wait for the next - * one before we try again. */ + * one before we try to initiate any more connections. */ continue; } - /* Cleanup the invalid intro points and save the node objects, if apply, - * in the exclude_nodes and retry_nodes list. */ - remove_invalid_intro_points(service, exclude_nodes, retry_nodes, now); - /* Let's try to rebuild circuit on the nodes we want to retry on. */ SMARTLIST_FOREACH_BEGIN(retry_nodes, rend_intro_point_t *, intro) { r = rend_service_launch_establish_intro(service, intro);

1 0

[tor/master] Simplify hidden service descriptor creation
by nickm＠torproject.org 05 Mar '17

05 Mar '17

commit 684778e705b0e873e61a4befc4f1017db795cc66 Author: teor <teor2345(a)gmail.com> Date: Thu Mar 2 15:55:33 2017 +1100 Simplify hidden service descriptor creation Use an existing flag to check if an introduction point is established. Cleanup after 21596. Fixes bug 21599; bugfix on 0.2.7.2-alpha. --- changes/bug21599 | 4 ++++ src/or/rendservice.c | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/changes/bug21599 b/changes/bug21599 new file mode 100644 index 0000000..fe0f21a --- /dev/null +++ b/changes/bug21599 @@ -0,0 +1,4 @@ + o Minor bugfixes (hidden services): + - Simplify hidden service descriptor creation by using an existing flag + to check if an introduction point is established. + Fixes bug 21599; bugfix on 0.2.7.2-alpha. diff --git a/src/or/rendservice.c b/src/or/rendservice.c index c23d45c..5155899 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -1035,7 +1035,6 @@ static void rend_service_update_descriptor(rend_service_t *service) { rend_service_descriptor_t *d; - origin_circuit_t *circ; int i; rend_service_descriptor_free(service->desc); @@ -1056,9 +1055,10 @@ rend_service_update_descriptor(rend_service_t *service) /* This intro point won't be listed in the descriptor... */ intro_svc->listed_in_last_desc = 0; - circ = find_intro_circuit(intro_svc, service->pk_digest); - if (!circ || circ->base_.purpose != CIRCUIT_PURPOSE_S_INTRO) { - /* This intro point's circuit isn't finished yet. Don't list it. */ + /* circuit_established is set in rend_service_intro_established(), and + * checked every second in rend_consider_services_intro_points(), so it's + * safe to use it here */ + if (!intro_svc->circuit_established) { continue; }

1 0

[tor/master] Merge branch 'bug21599_squashed'
by nickm＠torproject.org 05 Mar '17

05 Mar '17

commit 958ec0f5f877b84d8519102cc0b5b55583a15144 Merge: fe17955 684778e Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 4 23:16:29 2017 -0500 Merge branch 'bug21599_squashed' changes/bug21599 | 4 ++++ src/or/rendservice.c | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'teor/bug21596_030'
by nickm＠torproject.org 05 Mar '17

05 Mar '17

commit fe17955661551f869ea2777297bc44e08d01ec92 Merge: 3a1cba7 e0486c9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 4 23:10:40 2017 -0500 Merge remote-tracking branch 'teor/bug21596_030' changes/bug21596 | 5 +++++ src/or/rendservice.c | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-)

1 0

[tor/master] Make hidden services always check for failed intro point connections
by nickm＠torproject.org 05 Mar '17

05 Mar '17

commit e0486c937178981585d45b65b359f488ed96c06d Author: teor <teor2345(a)gmail.com> Date: Thu Mar 2 15:33:09 2017 +1100 Make hidden services always check for failed intro point connections Previously, they would stop checking when they exceeded their intro point creation limit. Fixes bug 21596; bugfix on commit d67bf8b2f23 in Tor 0.2.7.2-alpha. Reported by alecmuffett. --- changes/bug21596 | 5 +++++ src/or/rendservice.c | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/changes/bug21596 b/changes/bug21596 new file mode 100644 index 0000000..ec0a46b --- /dev/null +++ b/changes/bug21596 @@ -0,0 +1,5 @@ + o Minor bugfixes (hidden services): + - Make hidden services check for failed intro point connections, even when + they have exceeded their intro point creation limit. Fixes bug 21596; + bugfix on commit d67bf8b2f23 in Tor 0.2.7.2-alpha. Reported by + alecmuffett. diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 4d04da0..c04f5bb 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -3930,6 +3930,10 @@ rend_consider_services_intro_points(void) smartlist_clear(exclude_nodes); smartlist_clear(retry_nodes); + /* Cleanup the invalid intro points and save the node objects, if any, + * in the exclude_nodes and retry_nodes lists. */ + remove_invalid_intro_points(service, exclude_nodes, retry_nodes, now); + /* This retry period is important here so we don't stress circuit * creation. */ if (now > service->intro_period_started + INTRO_CIRC_RETRY_PERIOD) { @@ -3939,14 +3943,10 @@ rend_consider_services_intro_points(void) } else if (service->n_intro_circuits_launched >= MAX_INTRO_CIRCS_PER_PERIOD) { /* We have failed too many times in this period; wait for the next - * one before we try again. */ + * one before we try to initiate any more connections. */ continue; } - /* Cleanup the invalid intro points and save the node objects, if apply, - * in the exclude_nodes and retry_nodes list. */ - remove_invalid_intro_points(service, exclude_nodes, retry_nodes, now); - /* Let's try to rebuild circuit on the nodes we want to retry on. */ SMARTLIST_FOREACH_BEGIN(retry_nodes, rend_intro_point_t *, intro) { r = rend_service_launch_establish_intro(service, intro);

1 0