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

[tor/release-0.2.9] Merge branch 'ticket18329_minimal_025' into maint-0.2.5
by nickm＠torproject.org 18 Nov '17

18 Nov '17

commit 831d3b794da65b03be7e4fd107ba209d7211de76 Merge: 6f8c32b7d 9f2efd02a Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Nov 18 11:00:45 2017 -0500 Merge branch 'ticket18329_minimal_025' into maint-0.2.5 changes/bug18329-minimal | 6 ++++++ src/or/router.c | 9 +++++++++ 2 files changed, 15 insertions(+)

1 0

[tor/release-0.3.1] Merge branch 'ticket18329_minimal_025' into maint-0.2.5
by nickm＠torproject.org 18 Nov '17

18 Nov '17

commit 831d3b794da65b03be7e4fd107ba209d7211de76 Merge: 6f8c32b7d 9f2efd02a Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Nov 18 11:00:45 2017 -0500 Merge branch 'ticket18329_minimal_025' into maint-0.2.5 changes/bug18329-minimal | 6 ++++++ src/or/router.c | 9 +++++++++ 2 files changed, 15 insertions(+)

1 0

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

18 Nov '17

commit d388f9d879ebedf05c7f399f8b8eb3df9c43d3af Merge: 800797e7f 831d3b794 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Nov 18 11:01:33 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/bug18329-minimal | 6 ++++++ src/or/router.c | 9 +++++++++ 2 files changed, 15 insertions(+) diff --cc src/or/router.c index 01316c1bc,90b2431a2..bc7a2fcfc --- a/src/or/router.c +++ b/src/or/router.c @@@ -2748,6 -2385,16 +2748,15 @@@ … [View More]

1 0

[tor/release-0.3.1] Minimal implementation of bridge-distribution-request
by nickm＠torproject.org 18 Nov '17

18 Nov '17

commit 9f2efd02a1281998d11049162c11af6bfc5851c0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 13 20:44:51 2017 -0500 Minimal implementation of bridge-distribution-request Just advertise the line when we're a bridge, using "any" if we're published or "none" if we aren't. This is done in lieu of a full backport of #18329. --- changes/bug18329-minimal | 6 ++++++ src/or/router.c | 9 +++++++++ 2 files changed, 15 insertions(+) diff --… [View More]

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 18 Nov '17

18 Nov '17

commit 73585595245ac9551a1982575941e954bb870ad0 Merge: 1d5e693b6 2d849716d Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Nov 18 11:02:42 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug18329-minimal | 6 ++++++ src/or/router.c | 9 +++++++++ 2 files changed, 15 insertions(+)

1 0

[tor/release-0.3.0] Merge branch 'maint-0.2.5' into maint-0.2.8
by nickm＠torproject.org 18 Nov '17

18 Nov '17

commit d388f9d879ebedf05c7f399f8b8eb3df9c43d3af Merge: 800797e7f 831d3b794 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Nov 18 11:01:33 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/bug18329-minimal | 6 ++++++ src/or/router.c | 9 +++++++++ 2 files changed, 15 insertions(+) diff --cc src/or/router.c index 01316c1bc,90b2431a2..bc7a2fcfc --- a/src/or/router.c +++ b/src/or/router.c @@@ -2748,6 -2385,16 +2748,15 @@@ … [View More]

1 0

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

18 Nov '17

commit 53c3174ee43c3f54f8180be8256180f6f0d24c0d Merge: 1b9bb2c84 d388f9d87 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Nov 18 11:01:43 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug18329-minimal | 6 ++++++ src/or/router.c | 9 +++++++++ 2 files changed, 15 insertions(+)

1 0

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

18 Nov '17

commit 53c3174ee43c3f54f8180be8256180f6f0d24c0d Merge: 1b9bb2c84 d388f9d87 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Nov 18 11:01:43 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug18329-minimal | 6 ++++++ src/or/router.c | 9 +++++++++ 2 files changed, 15 insertions(+)

1 0

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

18 Nov '17

commit 53c3174ee43c3f54f8180be8256180f6f0d24c0d Merge: 1b9bb2c84 d388f9d87 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Nov 18 11:01:43 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug18329-minimal | 6 ++++++ src/or/router.c | 9 +++++++++ 2 files changed, 15 insertions(+)

1 0

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

18 Nov '17

commit e5cf65e8ea76cfb821a3dc0ac1b7eebaba41584a Merge: b84815881 53c3174ee Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Nov 18 11:03:16 2017 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug18329-minimal | 6 ++++++ src/or/router.c | 9 +++++++++ 2 files changed, 15 insertions(+)

1 0