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

[tor/maint-0.3.1] Merge remote-tracking branch 'karsten/geoip-jul2017' into maint-0.2.4
by nickm＠torproject.org 01 Aug '17

01 Aug '17

commit 6199e27a2b4ce4d56a1de9cf35ff09f79c9b6624 Merge: ebb441ded b6acfa491 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 11:19:24 2017 -0400 Merge remote-tracking branch 'karsten/geoip-jul2017' into maint-0.2.4 changes/geoip-july2017 | 4 + src/config/geoip | 10075 ++++++++++++++++++++++++++++++++--------------- src/config/geoip6 | 694 +++- 3 files changed, 7530 insertions(+), 3243 deletions(-)

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 9d24a352c01414b14c3ffe02541508345ca32a10 Merge: ad35e595e 925ef048a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 11:19:30 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/geoip-july2017 | 4 + src/config/geoip | 10075 ++++++++++++++++++++++++++++++++--------------- src/config/geoip6 | 694 +++- 3 files changed, 7530 insertions(+), 3243 deletions(-)

1 0

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

01 Aug '17

commit 925ef048a977ccee0edb44ba68db2397b36d8c92 Merge: 24ddf5862 0e7558ab6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 11:19:29 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/geoip-july2017 | 4 + src/config/geoip | 10075 ++++++++++++++++++++++++++++++++--------------- src/config/geoip6 | 694 +++- 3 files changed, 7530 insertions(+), 3243 deletions(-)

1 0

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

01 Aug '17

commit 0bfd1c318cdd468d2699714a36687e9cda16fabb Merge: af39c13a0 6199e27a2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 11:19:28 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-july2017 | 4 + src/config/geoip | 10075 ++++++++++++++++++++++++++++++++--------------- src/config/geoip6 | 694 +++- 3 files changed, 7530 insertions(+), 3243 deletions(-)

1 0

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

01 Aug '17

commit a48ae2aa67b31cc97942ac2c7fd6f29beba59e3b Merge: ddd66cc01 6862eada6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 11:19:29 2017 -0400 Merge branch 'maint-0.2.6' into maint-0.2.7-redux changes/geoip-july2017 | 4 + src/config/geoip | 10075 ++++++++++++++++++++++++++++++++--------------- src/config/geoip6 | 694 +++- 3 files changed, 7530 insertions(+), 3243 deletions(-)

1 0

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

01 Aug '17

commit 6862eada65a6f41304b32c3d4fca3da9c240d5bd Merge: f794b40ec 0bfd1c318 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 11:19:29 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/geoip-july2017 | 4 + src/config/geoip | 10075 ++++++++++++++++++++++++++++++++--------------- src/config/geoip6 | 694 +++- 3 files changed, 7530 insertions(+), 3243 deletions(-)

1 0

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

01 Aug '17

commit 925ef048a977ccee0edb44ba68db2397b36d8c92 Merge: 24ddf5862 0e7558ab6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 11:19:29 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/geoip-july2017 | 4 + src/config/geoip | 10075 ++++++++++++++++++++++++++++++++--------------- src/config/geoip6 | 694 +++- 3 files changed, 7530 insertions(+), 3243 deletions(-)

1 0

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

01 Aug '17

commit 6862eada65a6f41304b32c3d4fca3da9c240d5bd Merge: f794b40ec 0bfd1c318 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 11:19:29 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/geoip-july2017 | 4 + src/config/geoip | 10075 ++++++++++++++++++++++++++++++++--------------- src/config/geoip6 | 694 +++- 3 files changed, 7530 insertions(+), 3243 deletions(-)

1 0

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

01 Aug '17

commit 0bfd1c318cdd468d2699714a36687e9cda16fabb Merge: af39c13a0 6199e27a2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 11:19:28 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-july2017 | 4 + src/config/geoip | 10075 ++++++++++++++++++++++++++++++++--------------- src/config/geoip6 | 694 +++- 3 files changed, 7530 insertions(+), 3243 deletions(-)

1 0

[tor/maint-0.2.9] Merge branch 'maint-0.2.7-redux' into maint-0.2.8
by nickm＠torproject.org 01 Aug '17

01 Aug '17

commit 0e7558ab6495cdb64d605331d1dc28eb2a956e26 Merge: 5c5eb0f09 a48ae2aa6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 11:19:29 2017 -0400 Merge branch 'maint-0.2.7-redux' into maint-0.2.8 changes/geoip-july2017 | 4 + src/config/geoip | 10075 ++++++++++++++++++++++++++++++++--------------- src/config/geoip6 | 694 +++- 3 files changed, 7530 insertions(+), 3243 deletions(-)

1 0