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

[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 4d262035280101fcf54ab770ad3341215c261bd8 Merge: f69797b67 58e1c6dd8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 11:30:33 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0

1 0

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

01 Aug '17

commit 58e1c6dd868704520fcbd7d8d8bdd7f8dd6f5c58 Merge: 8500f0e4e 0151e1d15 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 11:30:29 2017 -0400 Merge remote-tracking branch 'public/bug19769_19025_029' into maint-0.2.9 changes/bug19025 | 4 ++++ changes/ticket19769 | 7 +++++++ src/or/dns.c | 33 ++++++++++++--------------------- src/or/dns.h | 14 ++++++++++++-- src/or/or.h | 12 ------------ src/test/test_cell_formats.c | 6 +++--- src/test/test_dns.c | 28 ++++------------------------ 7 files changed, 42 insertions(+), 62 deletions(-)

1 0

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

01 Aug '17

commit 8500f0e4e179280ebb8d6c1f3342eff21a4fdac2 Merge: 2b94b0ea7 ec5fe4120 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 11:28:36 2017 -0400 Merge remote-tracking branch 'public/bug20059_024_v2' into maint-0.2.9 changes/bug20059 | 3 +++ src/or/onion.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

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

01 Aug '17

commit 6ddc4d5e27e4cc361f23943c8945e76ca2bc4d91 Merge: 026882fa3 751c71827 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 11:28:40 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1

1 0

[tor/release-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 f69797b67cab3c5ad62d5a666b2919c3d29ef1e3 Merge: 84c4a2bc3 8500f0e4e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 11:28:39 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0

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 f69797b67cab3c5ad62d5a666b2919c3d29ef1e3 Merge: 84c4a2bc3 8500f0e4e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 11:28:39 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0

1 0

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

01 Aug '17

commit 8500f0e4e179280ebb8d6c1f3342eff21a4fdac2 Merge: 2b94b0ea7 ec5fe4120 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 11:28:36 2017 -0400 Merge remote-tracking branch 'public/bug20059_024_v2' into maint-0.2.9 changes/bug20059 | 3 +++ src/or/onion.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

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

01 Aug '17

commit 751c71827364f1c5d7291cc379c8ba977df1bf37 Merge: bf91b6e05 f69797b67 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 11:28:40 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1

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 59cd2493351940d8b4a7dcb95df8048d18fa9ff6 Merge: 93d376d8b f69797b67 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 11:28:40 2017 -0400 Merge branch 'maint-0.3.0' into release-0.3.0

1 0

[tor/maint-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 f69797b67cab3c5ad62d5a666b2919c3d29ef1e3 Merge: 84c4a2bc3 8500f0e4e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 11:28:39 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0

1 0