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

[tor/release-0.3.0] mingw fix: avoid "unused var" warning.
by nickm＠torproject.org 07 Jul '17

07 Jul '17

commit ae756f251ffe155336deef0bb97643203d1cfa56 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 6 13:12:33 2017 -0400 mingw fix: avoid "unused var" warning. This is a backport of 19615bce64cd381a925bc3910120ac39ca918e7c to fix bug 22838. --- changes/bug22838_028 | 5 +++++ src/test/test_switch_id.c | 1 + 2 files changed, 6 insertions(+) diff --git a/changes/bug22838_028 b/changes/bug22838_028 new file mode 100644 index 0000000..1d0a4fb --- /dev/null +++ b/changes/bug22838_028 @@ -0,0 +1,5 @@ + o Minor bugfixes (compilation, mingw, backport from 0.3.1.1-alpha): + - Backport a fix for an "unused variable" warning that appeared + in some versions of mingw. Fixes bug 22838; bugfix on + 0.2.8.1-alpha. + diff --git a/src/test/test_switch_id.c b/src/test/test_switch_id.c index 322f5bd..e12205b 100644 --- a/src/test/test_switch_id.c +++ b/src/test/test_switch_id.c @@ -79,6 +79,7 @@ main(int argc, char **argv) #if defined(_WIN32) (void) argc; (void) argv; + (void) which_test; fprintf(stderr, "This test is not supported on your OS.\n"); return 77;

1 0

[tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9
by nickm＠torproject.org 07 Jul '17

07 Jul '17

commit ed0fb218342dcf7cc54f6abd9078dcd3efa5452c Merge: 4858cda 48e45e2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 7 10:56:31 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug22838_028 | 5 +++++ src/test/test_switch_id.c | 1 + 2 files changed, 6 insertions(+)

1 0

[tor/release-0.2.9] mingw fix: avoid "unused var" warning.
by nickm＠torproject.org 07 Jul '17

07 Jul '17

commit ae756f251ffe155336deef0bb97643203d1cfa56 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 6 13:12:33 2017 -0400 mingw fix: avoid "unused var" warning. This is a backport of 19615bce64cd381a925bc3910120ac39ca918e7c to fix bug 22838. --- changes/bug22838_028 | 5 +++++ src/test/test_switch_id.c | 1 + 2 files changed, 6 insertions(+) diff --git a/changes/bug22838_028 b/changes/bug22838_028 new file mode 100644 index 0000000..1d0a4fb --- /dev/null +++ b/changes/bug22838_028 @@ -0,0 +1,5 @@ + o Minor bugfixes (compilation, mingw, backport from 0.3.1.1-alpha): + - Backport a fix for an "unused variable" warning that appeared + in some versions of mingw. Fixes bug 22838; bugfix on + 0.2.8.1-alpha. + diff --git a/src/test/test_switch_id.c b/src/test/test_switch_id.c index 322f5bd..e12205b 100644 --- a/src/test/test_switch_id.c +++ b/src/test/test_switch_id.c @@ -79,6 +79,7 @@ main(int argc, char **argv) #if defined(_WIN32) (void) argc; (void) argv; + (void) which_test; fprintf(stderr, "This test is not supported on your OS.\n"); return 77;

1 0

[tor/release-0.2.8] mingw fix: avoid "unused var" warning.
by nickm＠torproject.org 07 Jul '17

07 Jul '17

commit ae756f251ffe155336deef0bb97643203d1cfa56 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 6 13:12:33 2017 -0400 mingw fix: avoid "unused var" warning. This is a backport of 19615bce64cd381a925bc3910120ac39ca918e7c to fix bug 22838. --- changes/bug22838_028 | 5 +++++ src/test/test_switch_id.c | 1 + 2 files changed, 6 insertions(+) diff --git a/changes/bug22838_028 b/changes/bug22838_028 new file mode 100644 index 0000000..1d0a4fb --- /dev/null +++ b/changes/bug22838_028 @@ -0,0 +1,5 @@ + o Minor bugfixes (compilation, mingw, backport from 0.3.1.1-alpha): + - Backport a fix for an "unused variable" warning that appeared + in some versions of mingw. Fixes bug 22838; bugfix on + 0.2.8.1-alpha. + diff --git a/src/test/test_switch_id.c b/src/test/test_switch_id.c index 322f5bd..e12205b 100644 --- a/src/test/test_switch_id.c +++ b/src/test/test_switch_id.c @@ -79,6 +79,7 @@ main(int argc, char **argv) #if defined(_WIN32) (void) argc; (void) argv; + (void) which_test; fprintf(stderr, "This test is not supported on your OS.\n"); return 77;

1 0

[tor/master] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 07 Jul '17

07 Jul '17

commit 66c85cd8812c7d862edafc03b8e04bf3555733a3 Merge: 2dd1e21 ed0fb21 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 7 10:56:31 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug22838_028 | 5 +++++ src/test/test_switch_id.c | 1 + 2 files changed, 6 insertions(+)

1 0

[tor/master] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 07 Jul '17

07 Jul '17

commit c1bdc3b10e66de6d79c48c94628956b8578d5f17 Merge: 0e5cf4a 66c85cd Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 7 10:57:05 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 This is an "ours" commit to avoid taking the fix for 22838, which we already have here.

1 0

[tor/master] Merge branch 'maint-0.3.1'
by nickm＠torproject.org 07 Jul '17

07 Jul '17

commit aa792fd20a2a26c5bd4bb4a2d62ab89bcc55f2c5 Merge: 9e4b698 c1bdc3b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 7 10:57:27 2017 -0400 Merge branch 'maint-0.3.1'

1 0

[tor/release-0.2.8] Merge branch 'bug22838_028' into maint-0.2.8
by nickm＠torproject.org 07 Jul '17

07 Jul '17

commit 48e45e2fb1efa37dd08373e969d339c785585a7d Merge: c1e4aff ae756f2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 7 10:55:51 2017 -0400 Merge branch 'bug22838_028' into maint-0.2.8 changes/bug22838_028 | 5 +++++ src/test/test_switch_id.c | 1 + 2 files changed, 6 insertions(+)

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.8' into maint-0.2.9
by nickm＠torproject.org 07 Jul '17

07 Jul '17

commit ed0fb218342dcf7cc54f6abd9078dcd3efa5452c Merge: 4858cda 48e45e2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 7 10:56:31 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug22838_028 | 5 +++++ src/test/test_switch_id.c | 1 + 2 files changed, 6 insertions(+)

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by nickm＠torproject.org 07 Jul '17

07 Jul '17

commit d67c66536c90e32d779c53444f6668d9c5be4a3f Merge: 3cf8aac ed0fb21 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 7 10:56:31 2017 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug22838_028 | 5 +++++ src/test/test_switch_id.c | 1 + 2 files changed, 6 insertions(+)

1 0