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

[tor/maint-0.3.1] Merge branch 'maint-0.2.5' into maint-0.2.8
by nickm＠torproject.org 05 Oct '17

05 Oct '17

commit 91c17ffbd61348e63cac81e90583f0b22b3c17d4 Merge: d6bdec159 2e21493a8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 5 11:04:59 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/geoip-october2017 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

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

05 Oct '17

commit 43ebe54a24d3210ef037f7e2b67fad9597361bab Merge: 2984d9916 91c17ffbd Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 5 11:04:59 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/geoip-october2017 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 05 Oct '17

05 Oct '17

commit f7f55acae96c391767fec94f8a1932b5d4645897 Merge: ad7db1077 43ebe54a2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 5 11:04:59 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/geoip-october2017 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/maint-0.3.1] add missing subcategory in changes file
by nickm＠torproject.org 05 Oct '17

05 Oct '17

commit 2e21493a88c264e2df91078c3f14f269854755ef Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 5 11:04:54 2017 -0400 add missing subcategory in changes file --- changes/geoip-october2017 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/geoip-october2017 b/changes/geoip-october2017 index 547f2ccfd..11f623e85 100644 --- a/changes/geoip-october2017 +++ b/changes/geoip-october2017 @@ -1,4 +1,4 @@ - o Minor features: + o Minor features (geoip): - Update geoip and geoip6 to the October 4 2017 Maxmind GeoLite2 Country database.

1 0

[tor/master] add missing subcategory in changes file
by nickm＠torproject.org 05 Oct '17

05 Oct '17

commit 2e21493a88c264e2df91078c3f14f269854755ef Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 5 11:04:54 2017 -0400 add missing subcategory in changes file --- changes/geoip-october2017 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/geoip-october2017 b/changes/geoip-october2017 index 547f2ccfd..11f623e85 100644 --- a/changes/geoip-october2017 +++ b/changes/geoip-october2017 @@ -1,4 +1,4 @@ - o Minor features: + o Minor features (geoip): - Update geoip and geoip6 to the October 4 2017 Maxmind GeoLite2 Country database.

1 0

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

05 Oct '17

commit 2984d991653b70fcd561d7d0bd693c46220cec74 Merge: 2c93be80d d6bdec159 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 5 11:03:35 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/geoip-october2017 | 4 + src/config/geoip | 8683 +++++++++++++++++++++++++++------------------ src/config/geoip6 | 653 ++-- 3 files changed, 5654 insertions(+), 3686 deletions(-)

1 0

[tor/release-0.3.1] Merge branch 'maint-0.2.5' into maint-0.2.8
by nickm＠torproject.org 05 Oct '17

05 Oct '17

commit d6bdec1595751eba397d2ea20318538fcfb9c78a Merge: 8e52c4658 b9d9b16b7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 5 11:03:35 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/geoip-october2017 | 4 + src/config/geoip | 8683 +++++++++++++++++++++++++++------------------ src/config/geoip6 | 653 ++-- 3 files changed, 5654 insertions(+), 3686 deletions(-)

1 0

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

05 Oct '17

commit db4651469de43c06944fb5e27235a4a2bb4a4f81 Merge: 29b459a63 bdf60fc7c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 5 11:03:36 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/geoip-october2017 | 4 + src/config/geoip | 8683 +++++++++++++++++++++++++++------------------ src/config/geoip6 | 653 ++-- 3 files changed, 5654 insertions(+), 3686 deletions(-)

1 0

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

05 Oct '17

commit bdf60fc7ce40d5f78ac1f995447d104be48cbcea Merge: 82f109c2b ad7db1077 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 5 11:03:36 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/geoip-october2017 | 4 + src/config/geoip | 8683 +++++++++++++++++++++++++++------------------ src/config/geoip6 | 653 ++-- 3 files changed, 5654 insertions(+), 3686 deletions(-)

1 0

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

05 Oct '17

commit ad7db10770a396b1794364b9ec17dd4c17ee14dc Merge: dc5c9af6c 2984d9916 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 5 11:03:35 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/geoip-october2017 | 4 + src/config/geoip | 8683 +++++++++++++++++++++++++++------------------ src/config/geoip6 | 653 ++-- 3 files changed, 5654 insertions(+), 3686 deletions(-)

1 0