March 2018 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 13 Mar '18

13 Mar '18

commit 950606dcc947fee4a7196bce0bab1595164fbab0 Merge: 676a28599 38b7885c9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 13 10:58:03 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/geoip-2018-03-08 | 4 + src/config/geoip | 36382 ++++++++++++--------------------------------- src/config/geoip6 | 662 +- 3 files changed, 9970 insertions(+), 27078 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 13 Mar '18

13 Mar '18

commit 38b7885c90fd5e11495cb37f838fd55ca72e9290 Merge: 0026d1a67 0e7f15fdb Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 13 10:58:03 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/geoip-2018-03-08 | 4 + src/config/geoip | 36382 ++++++++++++--------------------------------- src/config/geoip6 | 662 +- 3 files changed, 9970 insertions(+), 27078 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 13 Mar '18

13 Mar '18

commit 6bc324c96abd463c4a386e81bd71b594ac59fed7 Merge: 950606dcc d60dc2755 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 13 10:59:30 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 13 Mar '18

13 Mar '18

commit d60dc27555a2bed448617e0b82e61817c9cff895 Merge: 094294dbb 0e7f15fdb Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 13 10:59:30 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/geoip-2018-03-08 | 4 + src/config/geoip | 36382 ++++++++++++--------------------------------- src/config/geoip6 | 662 +- 3 files changed, 9970 insertions(+), 27078 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.3.3'
by nickm＠torproject.org 13 Mar '18

13 Mar '18

commit c6d364e8ae9a0265dd3e80756d7e8e9901cf3dd6 Merge: 1047ef140 6bc324c96 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 13 10:59:56 2018 -0400 Merge branch 'maint-0.3.3' changes/geoip-2018-03-08 | 4 + src/config/geoip | 36382 ++++++++++++--------------------------------- src/config/geoip6 | 662 +- 3 files changed, 9970 insertions(+), 27078 deletions(-)

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 13 Mar '18

13 Mar '18

commit 2f397236b21a30899c7334b509200744a2a74987 Merge: 4b067f8b1 d60dc2755 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 13 10:59:30 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2

1 0

[tor/master] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 13 Mar '18

13 Mar '18

commit 0e7f15fdb6a5523ab1d4c856b5db455df3b3e1aa Merge: 0aa794d30 67a313f0e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 13 10:58:02 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/geoip-2018-03-08 | 4 + src/config/geoip | 36382 ++++++++++++--------------------------------- src/config/geoip6 | 662 +- 3 files changed, 9970 insertions(+), 27078 deletions(-)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 13 Mar '18

13 Mar '18

commit d60dc27555a2bed448617e0b82e61817c9cff895 Merge: 094294dbb 0e7f15fdb Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 13 10:59:30 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/geoip-2018-03-08 | 4 + src/config/geoip | 36382 ++++++++++++--------------------------------- src/config/geoip6 | 662 +- 3 files changed, 9970 insertions(+), 27078 deletions(-)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 13 Mar '18

13 Mar '18

commit 6bc324c96abd463c4a386e81bd71b594ac59fed7 Merge: 950606dcc d60dc2755 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 13 10:59:30 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by nickm＠torproject.org 13 Mar '18

13 Mar '18

commit 504dc5a93c33db5871305e3b501bb08c4210cb92 Merge: 09612b19c 6bc324c96 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 13 10:59:30 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3

1 0