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

[tor/release-0.3.0] Merge branch 'maint-0.2.7-redux' into maint-0.2.8
by nickm＠torproject.org 08 May '17

08 May '17

commit dc34cd7a04f54e63ab1c32a5de9fa116a8ad7ff8 Merge: 91c6b18 71dd1d7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 8 08:07:19 2017 -0400 Merge branch 'maint-0.2.7-redux' into maint-0.2.8 changes/geoip-may2017 | 4 + src/config/geoip | 5862 +++++++++++++++++++++++++++++++------------------ src/config/geoip6 | 689 +++++- 3 files changed, 4358 insertions(+), 2197 deletions(-)

1 0

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

08 May '17

commit 159ddf6ddedcad2bfc277a36fbde4aeb573be4cf Merge: 21d7767 68d6720 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 8 08:07:04 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/geoip-may2017 | 4 + src/config/geoip | 5862 +++++++++++++++++++++++++++++++------------------ src/config/geoip6 | 689 +++++- 3 files changed, 4358 insertions(+), 2197 deletions(-)

1 0

[tor/release-0.3.0] Merge branch 'maint-0.3.0' into release-0.3.0
by nickm＠torproject.org 08 May '17

08 May '17

commit a6cf5f60141f0bf2577ac552f8a8fde9152a6d7c Merge: 75e2256 f587691 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 8 08:08:36 2017 -0400 Merge branch 'maint-0.3.0' into release-0.3.0 changes/geoip-may2017 | 4 + src/config/geoip | 5862 +++++++++++++++++++++++++++++++------------------ src/config/geoip6 | 689 +++++- 3 files changed, 4358 insertions(+), 2197 deletions(-)

1 0

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

08 May '17

commit 68d6720452fda2ffbc1a484672aa6d09c99f1d41 Merge: a8a860e 5207e41 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 8 08:06:59 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-may2017 | 4 + src/config/geoip | 5862 +++++++++++++++++++++++++++++++------------------ src/config/geoip6 | 689 +++++- 3 files changed, 4358 insertions(+), 2197 deletions(-)

1 0

[tor/release-0.2.8] Merge branch 'maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 08 May '17

08 May '17

commit 159ddf6ddedcad2bfc277a36fbde4aeb573be4cf Merge: 21d7767 68d6720 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 8 08:07:04 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/geoip-may2017 | 4 + src/config/geoip | 5862 +++++++++++++++++++++++++++++++------------------ src/config/geoip6 | 689 +++++- 3 files changed, 4358 insertions(+), 2197 deletions(-)

1 0

[tor/release-0.2.8] Merge branch 'maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 08 May '17

08 May '17

commit 68d6720452fda2ffbc1a484672aa6d09c99f1d41 Merge: a8a860e 5207e41 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 8 08:06:59 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-may2017 | 4 + src/config/geoip | 5862 +++++++++++++++++++++++++++++++------------------ src/config/geoip6 | 689 +++++- 3 files changed, 4358 insertions(+), 2197 deletions(-)

1 0

[tor/release-0.2.8] Merge branch 'maint-0.2.6' into maint-0.2.7-redux
by nickm＠torproject.org 08 May '17

08 May '17

commit 71dd1d716ac83d98ab4592f46b984338a1a7685b Merge: 44bc882 159ddf6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 8 08:07:11 2017 -0400 Merge branch 'maint-0.2.6' into maint-0.2.7-redux changes/geoip-may2017 | 4 + src/config/geoip | 5862 +++++++++++++++++++++++++++++++------------------ src/config/geoip6 | 689 +++++- 3 files changed, 4358 insertions(+), 2197 deletions(-)

1 0

[tor/release-0.2.8] Merge branch 'maint-0.2.7-redux' into maint-0.2.8
by nickm＠torproject.org 08 May '17

08 May '17

commit dc34cd7a04f54e63ab1c32a5de9fa116a8ad7ff8 Merge: 91c6b18 71dd1d7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 8 08:07:19 2017 -0400 Merge branch 'maint-0.2.7-redux' into maint-0.2.8 changes/geoip-may2017 | 4 + src/config/geoip | 5862 +++++++++++++++++++++++++++++++------------------ src/config/geoip6 | 689 +++++- 3 files changed, 4358 insertions(+), 2197 deletions(-)

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 08 May '17

08 May '17

commit 68d6720452fda2ffbc1a484672aa6d09c99f1d41 Merge: a8a860e 5207e41 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 8 08:06:59 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-may2017 | 4 + src/config/geoip | 5862 +++++++++++++++++++++++++++++++------------------ src/config/geoip6 | 689 +++++- 3 files changed, 4358 insertions(+), 2197 deletions(-)

1 0

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

08 May '17

commit 5ff0b519ecee6e3d0b6d4550bd74f197a818b08d Merge: 4a9f689 dc34cd7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 8 08:07:32 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/geoip-may2017 | 4 + src/config/geoip | 5862 +++++++++++++++++++++++++++++++------------------ src/config/geoip6 | 689 +++++- 3 files changed, 4358 insertions(+), 2197 deletions(-)

1 0