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

[tor/release-0.3.0] Merge remote-tracking branch 'public/bug22245_024' into maint-0.2.9
by nickm＠torproject.org 01 Aug '17

01 Aug '17

commit 2b94b0ea721f2bd0127d097860ef64b915e2781a Merge: f6ecda840 a6514b8a2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 11:22:42 2017 -0400 Merge remote-tracking branch 'public/bug22245_024' into maint-0.2.9 changes/bug22245 | 5 +++++ src/or/hibernate.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

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

01 Aug '17

commit 9b65d7f4159a70bc83399614548782b458d19851 Merge: 5a739e59a 7c68b2f1a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 11:23:01 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1

1 0

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

01 Aug '17

commit 069728bdd78d5fe4e3bed796ba0fc343a3ded3a8 Merge: a05ceaaeb 9b65d7f41 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 11:23:01 2017 -0400 Merge branch 'maint-0.3.1'

1 0

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

01 Aug '17

commit 50b8a449b5b11ed3aef1ee3fc3badf0354e51c3b Merge: 4d0a8f53e 2b94b0ea7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 11:23:00 2017 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug22245 | 5 +++++ src/or/hibernate.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/release-0.2.9] Fix a logic error in hibernate.c
by nickm＠torproject.org 01 Aug '17

01 Aug '17

commit a6514b8a20b7a6fafb72bafad1e9c98a8e35cdee Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 15 11:43:18 2017 -0400 Fix a logic error in hibernate.c Closes bug 22245; bugfix on 0.0.9rc1, when bandwidth accounting was first introduced. Found by Andrey Karpov and reported at https://www.viva64.com/en/b/0507/ --- changes/bug22245 | 5 +++++ src/or/hibernate.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug22245 b/changes/bug22245 new file mode 100644 index 000000000..6ae18593e --- /dev/null +++ b/changes/bug22245 @@ -0,0 +1,5 @@ + o Minor bugfixes (bandwidth accounting): + - Roll over monthly accounting at the configured hour and minute, + rather than always at 00:00. + Fixes bug 22245; bugfix on 0.0.9rc1. + Found by Andrey Karpov with PVS-Studio. diff --git a/src/or/hibernate.c b/src/or/hibernate.c index a41257133..e5ed3d411 100644 --- a/src/or/hibernate.c +++ b/src/or/hibernate.c @@ -290,7 +290,7 @@ edge_of_accounting_period_containing(time_t now, int get_end) case UNIT_MONTH: { /* If this is before the Nth, we want the Nth of last month. */ if (tm.tm_mday < cfg_start_day || - (tm.tm_mday < cfg_start_day && before)) { + (tm.tm_mday == cfg_start_day && before)) { --tm.tm_mon; } /* Otherwise, the month is correct. */

1 0

[tor/release-0.3.0] Fix a logic error in hibernate.c
by nickm＠torproject.org 01 Aug '17

01 Aug '17

commit a6514b8a20b7a6fafb72bafad1e9c98a8e35cdee Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 15 11:43:18 2017 -0400 Fix a logic error in hibernate.c Closes bug 22245; bugfix on 0.0.9rc1, when bandwidth accounting was first introduced. Found by Andrey Karpov and reported at https://www.viva64.com/en/b/0507/ --- changes/bug22245 | 5 +++++ src/or/hibernate.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug22245 b/changes/bug22245 new file mode 100644 index 000000000..6ae18593e --- /dev/null +++ b/changes/bug22245 @@ -0,0 +1,5 @@ + o Minor bugfixes (bandwidth accounting): + - Roll over monthly accounting at the configured hour and minute, + rather than always at 00:00. + Fixes bug 22245; bugfix on 0.0.9rc1. + Found by Andrey Karpov with PVS-Studio. diff --git a/src/or/hibernate.c b/src/or/hibernate.c index a41257133..e5ed3d411 100644 --- a/src/or/hibernate.c +++ b/src/or/hibernate.c @@ -290,7 +290,7 @@ edge_of_accounting_period_containing(time_t now, int get_end) case UNIT_MONTH: { /* If this is before the Nth, we want the Nth of last month. */ if (tm.tm_mday < cfg_start_day || - (tm.tm_mday < cfg_start_day && before)) { + (tm.tm_mday == cfg_start_day && before)) { --tm.tm_mon; } /* Otherwise, the month is correct. */

1 0

[tor/release-0.2.9] Merge remote-tracking branch 'public/bug22245_024' into maint-0.2.9
by nickm＠torproject.org 01 Aug '17

01 Aug '17

commit 2b94b0ea721f2bd0127d097860ef64b915e2781a Merge: f6ecda840 a6514b8a2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 11:22:42 2017 -0400 Merge remote-tracking branch 'public/bug22245_024' into maint-0.2.9 changes/bug22245 | 5 +++++ src/or/hibernate.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.0] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 01 Aug '17

01 Aug '17

commit 7c68b2f1a500cffbd51aaf534669e1c863de5ec5 Merge: 1d48712c2 2b94b0ea7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 11:23:00 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug22245 | 5 +++++ src/or/hibernate.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.0] Merge branch 'maint-0.3.0' into release-0.3.0
by nickm＠torproject.org 01 Aug '17

01 Aug '17

commit 7902c2fa053ee3cf06d27e373fcb2ed8022ed843 Merge: 136fb78f4 7c68b2f1a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 11:23:00 2017 -0400 Merge branch 'maint-0.3.0' into release-0.3.0 changes/bug22245 | 5 +++++ src/or/hibernate.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 01 Aug '17

01 Aug '17

commit 1d48712c286981d56c1b3c56b3fc38adc31a1343 Merge: 9d24a352c f6ecda840 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 11:21:19 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug18100 | 5 +++++ src/or/connection_edge.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)

1 0