February 2019 - tor-commits - lists.torproject.org

[tor/release-0.4.0] stats: Make PaddingStatistics depend on ExtraInfoStatistics
by dgoulet＠torproject.org 26 Feb '19

26 Feb '19

commit 85c598cbc2d4ca1a7c729864002b5b222980ce19 Author: teor <teor(a)torproject.org> Date: Tue Jan 8 18:21:10 2019 +1000 stats: Make PaddingStatistics depend on ExtraInfoStatistics When ExtraInfoStatistics is 0, stop including PaddingStatistics in relay and bridge extra-info documents. Fixes bug 29017; bugfix on 0.3.1.1-alpha. --- changes/bug29017 | 4 ++++ doc/tor.1.txt | 2 +- src/or/router.c | 11 +++++------ 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/changes/bug29017 b/changes/bug29017 new file mode 100644 index 000000000..5c4a53c43 --- /dev/null +++ b/changes/bug29017 @@ -0,0 +1,4 @@ + o Minor bugfixes (stats): + - When ExtraInfoStatistics is 0, stop including PaddingStatistics in + relay and bridge extra-info documents. Fixes bug 29017; + bugfix on 0.3.1.1-alpha. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index c089bffbb..790ac6f6a 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2266,7 +2266,7 @@ is non-zero): extra-info document. (Default: 0) [[PaddingStatistics]] **PaddingStatistics** **0**|**1**:: - Relays only. + Relays and bridges only. When this option is enabled, Tor collects statistics for padding cells sent and received by this relay, in addition to total cell counts. These statistics are rounded, and omitted if traffic is low. This diff --git a/src/or/router.c b/src/or/router.c index edaa040dd..c308bcfae 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -3304,12 +3304,11 @@ extrainfo_dump_to_string(char **s_out, extrainfo_t *extrainfo, "conn-bi-direct", now, &contents) > 0) { smartlist_add(chunks, contents); } - } - - if (options->PaddingStatistics) { - contents = rep_hist_get_padding_count_lines(); - if (contents) - smartlist_add(chunks, contents); + if (options->PaddingStatistics) { + contents = rep_hist_get_padding_count_lines(); + if (contents) + smartlist_add(chunks, contents); + } } /* Add information about the pluggable transports we support. */

1 0

[tor/maint-0.3.5] Fix coverage script.
by dgoulet＠torproject.org 26 Feb '19

26 Feb '19

commit 192b312c977974680516e699c187d285f74ee8e0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 8 10:43:38 2019 -0500 Fix coverage script. It was looking for object files made with the old automake directorations, but those changed when we split up our libraries. Fixes bug 29435; bugfix on 0.3.5.1-alpha. --- changes/ticket29435 | 3 +++ scripts/test/coverage | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/ticket29435 b/changes/ticket29435 new file mode 100644 index 000000000..d48ae98e4 --- /dev/null +++ b/changes/ticket29435 @@ -0,0 +1,3 @@ + o Minor bugfixes (testing): + - Fix our gcov wrapper script to look for object files at the + correct locations. Fixes bug 29435; bugfix on 0.3.5.1-alpha. diff --git a/scripts/test/coverage b/scripts/test/coverage index 59d468ee1..b6e17abe2 100755 --- a/scripts/test/coverage +++ b/scripts/test/coverage @@ -13,8 +13,8 @@ for fn in src/core/*/*.c src/feature/*/*.c src/app/*/*.c src/lib/*/*.c; do F=`echo $BN | sed -e 's/\.c$//;'` GC="${BN}.gcov" # Figure out the object file names - ONS=`echo ${DN}/src_*-${F}.o` - ONS_WILDCARD_LITERAL="${DN}/src_*-${F}.o" + ONS=$(echo "${DN}"/*testing_a-"${F}".o) + ONS_WILDCARD_LITERAL="${DN}/*testing_a-${F}.o" # If the wildcard didn't expand, no files if [ "$ONS" != "${ONS_WILDCARD_LITERAL}" ] then

1 0

[tor/maint-0.3.5] Merge branch 'tor-github/pr/691' into maint-0.3.5
by dgoulet＠torproject.org 26 Feb '19

26 Feb '19

commit 1216f99534319f4739cd6b90f7aa3633191c2179 Merge: 955ca72f9 192b312c9 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Feb 26 10:46:52 2019 -0500 Merge branch 'tor-github/pr/691' into maint-0.3.5 changes/ticket29435 | 3 +++ scripts/test/coverage | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.4.0] Merge branch 'ticket29435_035' into ticket29435_040
by dgoulet＠torproject.org 26 Feb '19

26 Feb '19

commit f2b646a2b6111763f30d6d5193340044a0b29b01 Merge: 7f59b9fb1 192b312c9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 8 10:47:04 2019 -0500 Merge branch 'ticket29435_035' into ticket29435_040 changes/ticket29435 | 3 +++ scripts/test/coverage | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --cc scripts/test/coverage index 7a417cdc8,b6e17abe2..f61c83bc7 --- a/scripts/test/coverage +++ b/scripts/test/coverage @@@ -8,13 -8,13 +8,13 @@@ dst=$1 for fn in src/core/*/*.c src/feature/*/*.c src/app/*/*.c src/lib/*/*.c; do - BN=`basename $fn` - DN=`dirname $fn` - F=`echo $BN | sed -e 's/\.c$//;'` + BN=$(basename "$fn") + DN=$(dirname "$fn") + F=$(echo "$BN" | sed -e 's/\.c$//;') GC="${BN}.gcov" # Figure out the object file names - ONS=$(echo "${DN}"/src_*-"${F}".o) - ONS_WILDCARD_LITERAL="${DN}/src_*-${F}.o" + ONS=$(echo "${DN}"/*testing_a-"${F}".o) + ONS_WILDCARD_LITERAL="${DN}/*testing_a-${F}.o" # If the wildcard didn't expand, no files if [ "$ONS" != "${ONS_WILDCARD_LITERAL}" ] then

1 0

[tor/maint-0.4.0] Merge branch 'tor-github/pr/691' into maint-0.3.5
by dgoulet＠torproject.org 26 Feb '19

26 Feb '19

commit 1216f99534319f4739cd6b90f7aa3633191c2179 Merge: 955ca72f9 192b312c9 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Feb 26 10:46:52 2019 -0500 Merge branch 'tor-github/pr/691' into maint-0.3.5 changes/ticket29435 | 3 +++ scripts/test/coverage | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.4.0] Fix coverage script.
by dgoulet＠torproject.org 26 Feb '19

26 Feb '19

commit 192b312c977974680516e699c187d285f74ee8e0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 8 10:43:38 2019 -0500 Fix coverage script. It was looking for object files made with the old automake directorations, but those changed when we split up our libraries. Fixes bug 29435; bugfix on 0.3.5.1-alpha. --- changes/ticket29435 | 3 +++ scripts/test/coverage | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/ticket29435 b/changes/ticket29435 new file mode 100644 index 000000000..d48ae98e4 --- /dev/null +++ b/changes/ticket29435 @@ -0,0 +1,3 @@ + o Minor bugfixes (testing): + - Fix our gcov wrapper script to look for object files at the + correct locations. Fixes bug 29435; bugfix on 0.3.5.1-alpha. diff --git a/scripts/test/coverage b/scripts/test/coverage index 59d468ee1..b6e17abe2 100755 --- a/scripts/test/coverage +++ b/scripts/test/coverage @@ -13,8 +13,8 @@ for fn in src/core/*/*.c src/feature/*/*.c src/app/*/*.c src/lib/*/*.c; do F=`echo $BN | sed -e 's/\.c$//;'` GC="${BN}.gcov" # Figure out the object file names - ONS=`echo ${DN}/src_*-${F}.o` - ONS_WILDCARD_LITERAL="${DN}/src_*-${F}.o" + ONS=$(echo "${DN}"/*testing_a-"${F}".o) + ONS_WILDCARD_LITERAL="${DN}/*testing_a-${F}.o" # If the wildcard didn't expand, no files if [ "$ONS" != "${ONS_WILDCARD_LITERAL}" ] then

1 0

[tor/maint-0.4.0] Merge branch 'maint-0.3.5' into maint-0.4.0
by dgoulet＠torproject.org 26 Feb '19

26 Feb '19

commit 4746e1261b403302852e3107a986e663d2b063c1 Merge: 9c4ec414b 1216f9953 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Feb 26 10:48:12 2019 -0500 Merge branch 'maint-0.3.5' into maint-0.4.0

1 0

[tor/master] Merge branch 'tor-github/pr/692' into maint-0.4.0
by dgoulet＠torproject.org 26 Feb '19

26 Feb '19

commit 9c4ec414bdebbb7bdfd4d613d3a84447acb10eec Merge: 35257a1c6 f2b646a2b Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Feb 26 10:47:54 2019 -0500 Merge branch 'tor-github/pr/692' into maint-0.4.0 changes/ticket29435 | 3 +++ scripts/test/coverage | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.4.0] Merge branch 'tor-github/pr/692' into maint-0.4.0
by dgoulet＠torproject.org 26 Feb '19

26 Feb '19

commit 9c4ec414bdebbb7bdfd4d613d3a84447acb10eec Merge: 35257a1c6 f2b646a2b Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Feb 26 10:47:54 2019 -0500 Merge branch 'tor-github/pr/692' into maint-0.4.0 changes/ticket29435 | 3 +++ scripts/test/coverage | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'tor-github/pr/691' into maint-0.3.5
by dgoulet＠torproject.org 26 Feb '19

26 Feb '19

commit 1216f99534319f4739cd6b90f7aa3633191c2179 Merge: 955ca72f9 192b312c9 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Feb 26 10:46:52 2019 -0500 Merge branch 'tor-github/pr/691' into maint-0.3.5 changes/ticket29435 | 3 +++ scripts/test/coverage | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-)

1 0