[tor-commits] [tor/maint-0.2.9] Merge branch 'maint-0.2.7-redux' into maint-0.2.8

[nickm]

commit 0e7558ab6495cdb64d605331d1dc28eb2a956e26
Merge: 5c5eb0f09 a48ae2aa6
Author: Nick Mathewson 
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(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.2.9] Merge branch 'maint-0.2.7-redux' into maint-0.2.8

[nickm]

commit 5c5eb0f095c2744e8717f613a6edcc8d118f163a
Merge: fbf93614c ddd66cc01
Author: Nick Mathewson 
Date:   Wed Jul 26 15:39:55 2017 -0400

Merge branch 'maint-0.2.7-redux' into maint-0.2.8

 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.2.9] Merge branch 'maint-0.2.7-redux' into maint-0.2.8

[nickm]

commit fbf93614c9d42ff6bcd7b1252ad9f9e6ba2f890c
Merge: 48e45e2fb c362c6a85
Author: Nick Mathewson 
Date:   Wed Jul 26 15:35:07 2017 -0400

Merge branch 'maint-0.2.7-redux' into maint-0.2.8

 .travis.yml  | 88 
 changes/bug22636 |  8 ++
 2 files changed, 96 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.2.9] Merge branch 'maint-0.2.7-redux' into maint-0.2.8

[nickm]

commit c1e4aff384c483f64c66775011719267059f6915
Merge: 5ff0f1a 5472066
Author: Nick Mathewson 
Date:   Fri Jul 7 10:51:28 2017 -0400

Merge branch 'maint-0.2.7-redux' into maint-0.2.8

 changes/bug22789 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.2.9] Merge branch 'maint-0.2.7-redux' into maint-0.2.8

[nickm]

commit 5ff0f1ab9e3a0b82b177b3f710201d0ad35b69c4
Merge: 3483f7c 6cd6d48
Author: Nick Mathewson 
Date:   Wed Jul 5 13:42:47 2017 -0400

Merge branch 'maint-0.2.7-redux' into maint-0.2.8

 changes/bug22789 | 6 ++
 src/common/compat.c  | 8 ++--
 src/test/test_addr.c | 9 +
 3 files changed, 21 insertions(+), 2 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.2.9] Merge branch 'maint-0.2.7-redux' into maint-0.2.8

[nickm]

commit 3483f7c00349be6cba7b703f2e5ee94563d0c6eb
Merge: 307be8d 9a0fd2d
Author: Nick Mathewson 
Date:   Tue Jun 27 11:04:44 2017 -0400

Merge branch 'maint-0.2.7-redux' into maint-0.2.8

 changes/bug22737   | 12 
 src/or/connection_or.c |  4 +++-
 2 files changed, 15 insertions(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.2.9] Merge branch 'maint-0.2.7-redux' into maint-0.2.8

[nickm]

commit 307be8d4a7f1607b14bac6d9ed757e20a2008a16
Merge: 6e90d75 24ee859
Author: Nick Mathewson 
Date:   Fri Jun 9 09:58:45 2017 -0400

Merge branch 'maint-0.2.7-redux' into maint-0.2.8

 changes/geoip-june2017 |4 +
 src/config/geoip   | 5079 +---
 src/config/geoip6  | 1952 +--
 3 files changed, 4449 insertions(+), 2586 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.2.9] Merge branch 'maint-0.2.7-redux' into maint-0.2.8

[nickm]

commit 6e90d75061cea8a5bb09efe7c8a1cb0a7bc689d3
Merge: 5c47b92 2f6be06
Author: Nick Mathewson 
Date:   Thu Jun 8 14:06:16 2017 -0400

Merge branch 'maint-0.2.7-redux' into maint-0.2.8




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.2.9] Merge branch 'maint-0.2.7-redux' into maint-0.2.8

[nickm]

commit bff08ed8eb4f9c36d32ae5e15bd574052cca8d78
Merge: 792931d 4915d9c
Author: Nick Mathewson 
Date:   Thu Jun 8 09:29:05 2017 -0400

Merge branch 'maint-0.2.7-redux' into maint-0.2.8

"ours" merge to avoid version bump.




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.2.9] Merge branch 'maint-0.2.7-redux' into maint-0.2.8

[nickm]

commit d15d09a96839e0c13a9b9845a51a402d7a931949
Merge: d850d27 c1646d6
Author: Nick Mathewson 
Date:   Thu Jun 8 09:21:15 2017 -0400

Merge branch 'maint-0.2.7-redux' into maint-0.2.8

 changes/trove-2017-005 | 7 +++
 src/or/relay.c | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.2.9] Merge branch 'maint-0.2.7-redux' into maint-0.2.8

[nickm]

commit d850d27369020706769e9e8a0d5fec621a5deb8a
Merge: 33fcc0f 9a6f938
Author: Nick Mathewson 
Date:   Mon Jun 5 14:48:30 2017 -0400

Merge branch 'maint-0.2.7-redux' into maint-0.2.8




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.2.9] Merge branch 'maint-0.2.7-redux' into maint-0.2.8

[nickm]

commit 33fcc0f61d1feb2fbdf3153c7c64780dcdce6767
Merge: 5b45d73 3f2d1f7
Author: Nick Mathewson 
Date:   Mon Jun 5 12:01:17 2017 -0400

Merge branch 'maint-0.2.7-redux' into maint-0.2.8

 changes/bug22490 | 3 +++
 src/or/geoip.c   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.2.9] Merge branch 'maint-0.2.7-redux' into maint-0.2.8

[nickm]

commit dc34cd7a04f54e63ab1c32a5de9fa116a8ad7ff8
Merge: 91c6b18 71dd1d7
Author: Nick Mathewson 
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(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.2.9] Merge branch 'maint-0.2.7-redux' into maint-0.2.8

[nickm]

commit 91c6b18ca055fa709ade362a315aa64820081a0d
Merge: 2cfecec 44bc882
Author: Nick Mathewson 
Date:   Thu Apr 6 08:31:32 2017 -0400

Merge branch 'maint-0.2.7-redux' into maint-0.2.8

 changes/geoip-april2017 | 4 +
 src/config/geoip| 14366 +-
 src/config/geoip6   |   677 ++-
 3 files changed, 9792 insertions(+), 5255 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.2.9] Merge branch 'maint-0.2.7-redux' into maint-0.2.8

[nickm]

commit 2cfecec9c795918587fa853bba606c05e513
Merge: f93bcab 25c28bc
Author: Nick Mathewson 
Date:   Wed Mar 8 10:11:23 2017 -0500

Merge branch 'maint-0.2.7-redux' into maint-0.2.8

 changes/geoip-march2017 | 4 +
 src/config/geoip| 13115 +++---
 src/config/geoip6   |   754 ++-
 3 files changed, 5884 insertions(+), 7989 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.2.9] Merge branch 'maint-0.2.7-redux' into maint-0.2.8

[nickm]

commit f93bcab60e09618bf5b9ec55c6f4f338f2a7cd06
Merge: f2a657c b5526be
Author: Nick Mathewson 
Date:   Tue Feb 28 10:37:25 2017 -0500

Merge branch 'maint-0.2.7-redux' into maint-0.2.8

This is an "ours" merge to avoid taking a version bump, and to
avoid replaying the post-0.2.7.6 history of "maint-0.2.7-redux" onto 
maint-0.2.8, which already included the relevant changes.




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits