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

[tor/release-0.4.0] Merge branch 'maint-0.4.0' into release-0.4.0
by teor＠torproject.org 30 Aug '19

30 Aug '19

commit eda8e06319b89bc5ac90045a0af0afbb3140bdfd Merge: d05db8601 a52a5e009 Author: teor <teor(a)torproject.org> Date: Fri Aug 30 23:33:06 2019 +1000 Merge branch 'maint-0.4.0' into release-0.4.0 changes/bug30894 | 4 ++++ changes/bug31003 | 4 ++++ changes/ticket30871 | 6 +++++ src/app/config/confparse.c | 1 + src/feature/client/entrynodes.c | 4 ++++ src/feature/nodelist/routerlist.c | 12 +++++----- src/test/test_circuitbuild.c | 47 +++++++++++++++++++++++++++++++++++++++ 7 files changed, 72 insertions(+), 6 deletions(-)

1 0

[tor/release-0.4.0] Merge branch 'maint-0.3.5' into maint-0.4.0
by teor＠torproject.org 30 Aug '19

30 Aug '19

commit a52a5e0099f9201e0dc1a358b1ac7721070caf56 Merge: 357e9a6f2 1132dc9f7 Author: teor <teor(a)torproject.org> Date: Fri Aug 30 23:33:01 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/bug30894 | 4 ++++ changes/bug31003 | 4 ++++ changes/ticket30871 | 6 +++++ src/app/config/confparse.c | 1 + src/feature/client/entrynodes.c | 4 ++++ src/feature/nodelist/routerlist.c | 12 +++++----- src/test/test_circuitbuild.c | 47 +++++++++++++++++++++++++++++++++++++++ 7 files changed, 72 insertions(+), 6 deletions(-)

1 0

[tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/1114' into maint-0.3.5
by teor＠torproject.org 30 Aug '19

30 Aug '19

commit 4662cbec7bd33fee973e467615ab30933138c279 Merge: 190386f1c 4ab1d1c0c Author: teor <teor(a)torproject.org> Date: Fri Aug 30 23:20:59 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1114' into maint-0.3.5 changes/bug30894 | 4 ++++ src/app/config/confparse.c | 1 + 2 files changed, 5 insertions(+)

1 0

[tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/1117' into maint-0.3.5
by teor＠torproject.org 30 Aug '19

30 Aug '19

commit b66712d85b5eb6a95db8d28a678ab8dd1baec19b Merge: 4662cbec7 e3f347803 Author: teor <teor(a)torproject.org> Date: Fri Aug 30 23:22:18 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1117' into maint-0.3.5 changes/ticket30871 | 6 ++++++ src/feature/client/entrynodes.c | 4 ++++ src/test/test_circuitbuild.c | 47 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+)

1 0

[tor/release-0.3.5] Merge remote-tracking branch 'tor-github/pr/1181' into maint-0.3.5
by teor＠torproject.org 30 Aug '19

30 Aug '19

commit 1132dc9f75d7e5cbda1c5a6ac91d82c420967c0e Merge: b66712d85 a9379d675 Author: teor <teor(a)torproject.org> Date: Fri Aug 30 23:24:05 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1181' into maint-0.3.5 changes/bug31003 | 4 ++++ src/feature/nodelist/routerlist.c | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-)

1 0

[tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/1181' into maint-0.3.5
by teor＠torproject.org 30 Aug '19

30 Aug '19

commit 1132dc9f75d7e5cbda1c5a6ac91d82c420967c0e Merge: b66712d85 a9379d675 Author: teor <teor(a)torproject.org> Date: Fri Aug 30 23:24:05 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1181' into maint-0.3.5 changes/bug31003 | 4 ++++ src/feature/nodelist/routerlist.c | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-)

1 0

[tor/release-0.4.1] Merge remote-tracking branch 'tor-github/pr/1114' into maint-0.3.5
by teor＠torproject.org 30 Aug '19

30 Aug '19

commit 4662cbec7bd33fee973e467615ab30933138c279 Merge: 190386f1c 4ab1d1c0c Author: teor <teor(a)torproject.org> Date: Fri Aug 30 23:20:59 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1114' into maint-0.3.5 changes/bug30894 | 4 ++++ src/app/config/confparse.c | 1 + 2 files changed, 5 insertions(+)

1 0

[tor/release-0.4.1] Merge remote-tracking branch 'tor-github/pr/1117' into maint-0.3.5
by teor＠torproject.org 30 Aug '19

30 Aug '19

commit b66712d85b5eb6a95db8d28a678ab8dd1baec19b Merge: 4662cbec7 e3f347803 Author: teor <teor(a)torproject.org> Date: Fri Aug 30 23:22:18 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1117' into maint-0.3.5 changes/ticket30871 | 6 ++++++ src/feature/client/entrynodes.c | 4 ++++ src/test/test_circuitbuild.c | 47 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+)

1 0

[tor/release-0.4.1] Merge branch 'maint-0.4.0' into maint-0.4.1
by teor＠torproject.org 30 Aug '19

30 Aug '19

commit 25e7fc5b7a84c926f3acebd385e97d2679097bd6 Merge: ff905f8e1 a52a5e009 Author: teor <teor(a)torproject.org> Date: Fri Aug 30 23:33:10 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1

1 0

[tor/release-0.3.5] Merge remote-tracking branch 'tor-github/pr/1117' into maint-0.3.5
by teor＠torproject.org 30 Aug '19

30 Aug '19

commit b66712d85b5eb6a95db8d28a678ab8dd1baec19b Merge: 4662cbec7 e3f347803 Author: teor <teor(a)torproject.org> Date: Fri Aug 30 23:22:18 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1117' into maint-0.3.5 changes/ticket30871 | 6 ++++++ src/feature/client/entrynodes.c | 4 ++++ src/test/test_circuitbuild.c | 47 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+)

1 0