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

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

03 Aug '17

commit 93b28972c10cfc87ab1865bead3ba713901d9d79 Merge: 0e7558ab6 1280de42a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 3 08:44:31 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/geoip-august2017 | 4 + src/config/geoip | 10796 ++++++++++++++++++++++++++++----------------- src/config/geoip6 | 607 ++- 3 files changed, 7161 insertions(+), 4246 deletions(-)

1 0

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

03 Aug '17

commit e220e6e4372dad90cac9138ec21ea91d4f6df7ca Merge: a9a8d53de f33c96610 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 3 08:44:31 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/geoip-august2017 | 4 + src/config/geoip | 10796 ++++++++++++++++++++++++++++----------------- src/config/geoip6 | 607 ++- 3 files changed, 7161 insertions(+), 4246 deletions(-)

1 0

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

03 Aug '17

commit e084fa419a77c21c810ef6c65287259e1c9bdd32 Merge: 3938692f3 e220e6e43 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 3 08:44:32 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/geoip-august2017 | 4 + src/config/geoip | 10796 ++++++++++++++++++++++++++++----------------- src/config/geoip6 | 607 ++- 3 files changed, 7161 insertions(+), 4246 deletions(-)

1 0

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

03 Aug '17

commit 9696021593d28a7ae3b6a88ac57ff31234b469f5 Merge: 58e1c6dd8 93b28972c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 3 08:44:31 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/geoip-august2017 | 4 + src/config/geoip | 10796 ++++++++++++++++++++++++++++----------------- src/config/geoip6 | 607 ++- 3 files changed, 7161 insertions(+), 4246 deletions(-)

1 0

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

03 Aug '17

commit f33c96610f143c71c0309c1021821ab05878f8a0 Merge: 8925e84be 969602159 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 3 08:44:31 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/geoip-august2017 | 4 + src/config/geoip | 10796 ++++++++++++++++++++++++++++----------------- src/config/geoip6 | 607 ++- 3 files changed, 7161 insertions(+), 4246 deletions(-)

1 0

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

03 Aug '17

commit 9696021593d28a7ae3b6a88ac57ff31234b469f5 Merge: 58e1c6dd8 93b28972c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 3 08:44:31 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/geoip-august2017 | 4 + src/config/geoip | 10796 ++++++++++++++++++++++++++++----------------- src/config/geoip6 | 607 ++- 3 files changed, 7161 insertions(+), 4246 deletions(-)

1 0

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

03 Aug '17

commit 75e0843893b9f050352f8a16abd1004882ff76a4 Merge: abe5b07c1 f33c96610 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 3 08:44:31 2017 -0400 Merge branch 'maint-0.3.0' into release-0.3.0 changes/geoip-august2017 | 4 + src/config/geoip | 10796 ++++++++++++++++++++++++++++----------------- src/config/geoip6 | 607 ++- 3 files changed, 7161 insertions(+), 4246 deletions(-)

1 0

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

03 Aug '17

commit f33c96610f143c71c0309c1021821ab05878f8a0 Merge: 8925e84be 969602159 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 3 08:44:31 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/geoip-august2017 | 4 + src/config/geoip | 10796 ++++++++++++++++++++++++++++----------------- src/config/geoip6 | 607 ++- 3 files changed, 7161 insertions(+), 4246 deletions(-)

1 0

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

03 Aug '17

commit 93b28972c10cfc87ab1865bead3ba713901d9d79 Merge: 0e7558ab6 1280de42a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 3 08:44:31 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/geoip-august2017 | 4 + src/config/geoip | 10796 ++++++++++++++++++++++++++++----------------- src/config/geoip6 | 607 ++- 3 files changed, 7161 insertions(+), 4246 deletions(-)

1 0

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

03 Aug '17

commit 9696021593d28a7ae3b6a88ac57ff31234b469f5 Merge: 58e1c6dd8 93b28972c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 3 08:44:31 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/geoip-august2017 | 4 + src/config/geoip | 10796 ++++++++++++++++++++++++++++----------------- src/config/geoip6 | 607 ++- 3 files changed, 7161 insertions(+), 4246 deletions(-)

1 0