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

[tor/maint-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 12 Dec '17

12 Dec '17

commit 04524443d071f3e310067e0a7ecdc52a97e80107 Merge: 736e7299c 2ea573ece Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/ticket23856 | 4 ++++ src/or/rephist.c | 4 ++-- src/or/router.c | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 12 Dec '17

12 Dec '17

commit 43fb8fc5cba65edbd882729580e0d67857ecf7fe Merge: e553bf3ce 04524443d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2

1 0

[tor/master] Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5
by nickm＠torproject.org 12 Dec '17

12 Dec '17

commit f5d4bdf305d2341f7ff531fc9c8ed08511bd503d Merge: 461e34bb3 8be50ca3e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:53:02 2017 -0500 Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5 changes/ticket23856 | 4 ++++ src/or/rephist.c | 4 ++-- src/or/router.c | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 12 Dec '17

12 Dec '17

commit 2ea573ece8f168749b40eddcd023b71bf05a4fef Merge: 7fcb222ab eaaa1108a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/ticket23856 | 4 ++++ src/or/rephist.c | 4 ++-- src/or/router.c | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.2.5' into maint-0.2.8
by nickm＠torproject.org 12 Dec '17

12 Dec '17

commit bc1ea4f470734f7fa22949318a98e286da5cba49 Merge: f97f301b5 f5d4bdf30 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:54:11 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/ticket23856 | 4 ++++ src/or/rephist.c | 4 ++-- src/or/router.c | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --cc src/or/router.c index bc7a2fcfc,e1c2d20b3..b134f2e31 --- a/src/or/router.c +++ b/src/or/router.c @@@ -2310,9 -2063,8 +2310,9 @@@ mark_my_descriptor_dirty(const char *re } /** How frequently will we republish our descriptor because of large (factor - * of 2) shifts in estimated bandwidth? */ + * of 2) shifts in estimated bandwidth? Note: We don't use this constant + * if our previous bandwidth estimate was exactly 0. */ - #define MAX_BANDWIDTH_CHANGE_FREQ (20*60) + #define MAX_BANDWIDTH_CHANGE_FREQ (3*60*60) /** Check whether bandwidth has changed a lot since the last time we announced * bandwidth. If so, mark our descriptor dirty. */

1 0

[tor/maint-0.3.2] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 12 Dec '17

12 Dec '17

commit 04524443d071f3e310067e0a7ecdc52a97e80107 Merge: 736e7299c 2ea573ece Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/ticket23856 | 4 ++++ src/or/rephist.c | 4 ++-- src/or/router.c | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-)

1 0

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

12 Dec '17

commit 2ea573ece8f168749b40eddcd023b71bf05a4fef Merge: 7fcb222ab eaaa1108a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/ticket23856 | 4 ++++ src/or/rephist.c | 4 ++-- src/or/router.c | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 12 Dec '17

12 Dec '17

commit 43fb8fc5cba65edbd882729580e0d67857ecf7fe Merge: e553bf3ce 04524443d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2

1 0

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

12 Dec '17

commit 04524443d071f3e310067e0a7ecdc52a97e80107 Merge: 736e7299c 2ea573ece Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/ticket23856 | 4 ++++ src/or/rephist.c | 4 ++-- src/or/router.c | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.3.2'
by nickm＠torproject.org 12 Dec '17

12 Dec '17

commit 422ff8f922d2df7b90aba3e6e16c41100387b282 Merge: 16ec4da68 43fb8fc5c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.3.2'

1 0