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

2017-08-01 Thread 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/master] Merge branch 'maint-0.2.7-redux' into maint-0.2.8

2017-07-26 Thread 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/master] Merge branch 'maint-0.2.7-redux' into maint-0.2.8

2017-07-26 Thread 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/master] Merge branch 'maint-0.2.7-redux' into maint-0.2.8

2017-07-07 Thread 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/master] Merge branch 'maint-0.2.7-redux' into maint-0.2.8

2017-07-05 Thread 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/master] Merge branch 'maint-0.2.7-redux' into maint-0.2.8

2017-06-27 Thread 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/master] Merge branch 'maint-0.2.7-redux' into maint-0.2.8

2017-06-09 Thread 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/master] Merge branch 'maint-0.2.7-redux' into maint-0.2.8

2017-06-08 Thread 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/master] Merge branch 'maint-0.2.7-redux' into maint-0.2.8

2017-06-08 Thread 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/master] Merge branch 'maint-0.2.7-redux' into maint-0.2.8

2017-06-08 Thread 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/master] Merge branch 'maint-0.2.7-redux' into maint-0.2.8

2017-06-05 Thread 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/master] Merge branch 'maint-0.2.7-redux' into maint-0.2.8

2017-06-05 Thread 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/master] Merge branch 'maint-0.2.7-redux' into maint-0.2.8

2017-05-08 Thread 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/master] Merge branch 'maint-0.2.7-redux' into maint-0.2.8

2017-04-06 Thread 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/master] Merge branch 'maint-0.2.7-redux' into maint-0.2.8

2017-03-08 Thread 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/master] Merge branch 'maint-0.2.7-redux' into maint-0.2.8

2017-02-28 Thread 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

[tor-commits] [tor/master] Merge branch 'maint-0.2.7' into release-0.2.7

2017-02-28 Thread nickm 
commit b2a53e8ca910391a10451860a1aaf66b3c207f50
Merge: e0fa07c c6a3375
Author: Roger Dingledine 
Date:   Thu Dec 10 04:12:10 2015 -0500

Merge branch 'maint-0.2.7' into release-0.2.7

 changes/bug16056   |4 +
 changes/bug16702   |4 +
 changes/bug17551   |4 +
 changes/bug17722   |3 +
 changes/bug17772   |7 +
 changes/bug17781   |3 +
 changes/geoip-december2015 |4 +
 configure.ac   |3 +
 src/config/geoip   | 4547 
 src/config/geoip6  | 2580 +
 src/or/policies.c  |6 +-
 src/or/rendservice.c   |3 +-
 src/or/routerlist.c|   10 +-
 src/or/torcert.c   |6 +-
 14 files changed, 5558 insertions(+), 1626 deletions(-)



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

[tor-commits] [tor/master] Merge branch 'maint-0.2.7' into release-0.2.7

2017-02-28 Thread nickm 
commit e0fa07c06fc1a8761b5f4b33028f157a130831a4
Merge: b6024ec 18ee193
Author: Nick Mathewson 
Date:   Fri Nov 20 10:27:51 2015 -0500

Merge branch 'maint-0.2.7' into release-0.2.7

 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)



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

[tor-commits] [tor/master] Merge branch 'maint-0.2.7' into release-0.2.7

2017-02-28 Thread nickm 
commit e46ea4a75da3fafcb74e8d50faa3df116e1c8eda
Merge: 4dd7a55 741d2dc
Author: Nick Mathewson 
Date:   Fri Nov 13 08:41:42 2015 -0500

Merge branch 'maint-0.2.7' into release-0.2.7

 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)



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

[tor-commits] [tor/master] Merge branch 'maint-0.2.7' into release-0.2.7

2017-02-28 Thread nickm 
commit f01f8e18b80b195f49cb48561b85f6eaae85e8cb
Merge: 6f3f753 7fb19f1
Author: Nick Mathewson 
Date:   Thu Dec 10 10:05:08 2015 -0500

Merge branch 'maint-0.2.7' into release-0.2.7

 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)



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

[tor-commits] [tor/master] Merge branch 'maint-0.2.7' into release-0.2.7

2017-02-28 Thread nickm 
commit 67f0b51c9239dd1d2318007e3f503d4e09c3097b
Merge: 976f392 8378a33
Author: Nick Mathewson 
Date:   Mon Oct 19 11:20:03 2015 -0400

Merge branch 'maint-0.2.7' into release-0.2.7

 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)



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

[tor-commits] [tor/master] Merge branch 'maint-0.2.7' into release-0.2.7

2017-02-28 Thread nickm 
commit ff174995f07747628ad1e71fd344fc27e88a70ed
Merge: fbaee1b 5d45a26
Author: Nick Mathewson 
Date:   Wed Oct 21 11:06:47 2015 -0400

Merge branch 'maint-0.2.7' into release-0.2.7

 changes/bug17398|  3 +++
 changes/bug17401|  3 +++
 changes/bug17402|  3 +++
 src/common/crypto_ed25519.c |  1 +
 src/or/rendcache.c  | 24 
 5 files changed, 26 insertions(+), 8 deletions(-)



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

[tor-commits] [tor/master] Merge branch 'maint-0.2.7' into release-0.2.7

2017-02-28 Thread nickm 
commit cd8a62a60cbafb61bed8b64e988dacf2b1444668
Merge: 3f3a753 7b859fd
Author: Nick Mathewson 
Date:   Wed Oct 21 13:35:04 2015 -0400

Merge branch 'maint-0.2.7' into release-0.2.7

 changes/bug17364| 3 +++
 changes/bug17403| 3 +++
 changes/bug17404| 6 ++
 doc/tor.1.txt   | 4 ++--
 src/common/tortls.c | 4 
 src/or/routerkeys.c | 2 ++
 6 files changed, 20 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/master] Merge branch 'maint-0.2.7' of git-rw.torproject.org:/tor into maint-0.2.7

2017-02-15 Thread nickm 
commit 67877f55add6022c024952d453043b0cb59b75d7
Merge: ed80684 5c42358
Author: Nick Mathewson 
Date:   Wed Feb 15 07:51:48 2017 -0500

Merge branch 'maint-0.2.7' of git-rw.torproject.org:/tor into maint-0.2.7




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

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

2017-02-15 Thread nickm 
commit 5222054163e0233dfc2cf59de779b2f816bfeb63
Merge: 71cd68b e6376a8
Author: Nick Mathewson 
Date:   Wed Feb 15 07:52:47 2017 -0500

Merge branch 'maint-0.2.7' 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/master] Merge branch 'maint-0.2.7' into maint-0.2.8

2017-02-15 Thread nickm 
commit 1ebdae61711ec03ce49af2f356756b5db9587412
Merge: 9b90d51 ed80684
Author: Nick Mathewson 
Date:   Wed Feb 15 07:47:28 2017 -0500

Merge branch 'maint-0.2.7' into maint-0.2.8

 changes/bug20384 | 10 ++
 changes/trove-2017-001.2 |  8 
 src/or/routerparse.c | 49 +---
 3 files changed, 48 insertions(+), 19 deletions(-)




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

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

2017-02-13 Thread arma 
commit 9ff76185d284f1982b5f49b2c652f7a05e71ba2b
Merge: 9b90d51 5c42358
Author: Roger Dingledine 
Date:   Mon Feb 13 15:39:13 2017 -0500

Merge branch 'maint-0.2.7' 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/master] Merge branch 'maint-0.2.7' into maint-0.2.8

2017-02-13 Thread nickm 
commit 9b90d515a9fc52c2579d55406e78de8d2fb5fa19
Merge: eca4a89 75fe218
Author: Nick Mathewson 
Date:   Mon Feb 13 14:37:55 2017 -0500

Merge branch 'maint-0.2.7' into maint-0.2.8

 changes/geoip-february2017 | 4 +
 src/config/geoip   | 10832 ---
 src/config/geoip6  |  1651 ++-
 3 files changed, 7351 insertions(+), 5136 deletions(-)



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

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

2017-02-07 Thread nickm 
commit eca4a89319c566c0e320c7f713aed0f7e34330eb
Merge: a9f936d 4bce207
Author: Nick Mathewson 
Date:   Tue Feb 7 10:39:13 2017 -0500

Merge branch 'maint-0.2.7' 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/master] Merge branch 'maint-0.2.7' into maint-0.2.8

2017-02-07 Thread nickm 
commit a9f936d0d757c5628a8da0b88af4710b2f6d22fd
Merge: b60fb3a 86d5a6f
Author: Nick Mathewson 
Date:   Tue Feb 7 09:30:10 2017 -0500

Merge branch 'maint-0.2.7' 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/master] Merge branch 'maint-0.2.7' into maint-0.2.8

2017-02-07 Thread nickm 
commit b60fb3ab8b803b535a81296dbbf7d0c218a3dd27
Merge: 93ea18e 0a43134
Author: Nick Mathewson 
Date:   Tue Feb 7 09:20:45 2017 -0500

Merge branch 'maint-0.2.7' 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/master] Merge branch 'maint-0.2.7' into maint-0.2.8

2017-02-07 Thread nickm 
commit 93ea18e918813ec5e30ac7dc02fc4b545397396e
Merge: 7b24f3e 115cefd
Author: Nick Mathewson 
Date:   Tue Feb 7 08:55:28 2017 -0500

Merge branch 'maint-0.2.7' 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/master] Merge branch 'maint-0.2.7' into maint-0.2.8

2017-02-07 Thread nickm 
commit 7b24f3e0fef04cdb21cd0b73ec4fde457702a81b
Merge: c77ace6 eb72365
Author: Nick Mathewson 
Date:   Tue Feb 7 08:39:33 2017 -0500

Merge branch 'maint-0.2.7' 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/master] Merge branch 'maint-0.2.7' into maint-0.2.8

2017-01-11 Thread nickm 
commit c77ace69bb7342522366a6ce2bdb51a26bf34f57
Merge: cb2e205 8c91cbb
Author: Nick Mathewson 
Date:   Wed Jan 11 09:13:15 2017 -0500

Merge branch 'maint-0.2.7' into maint-0.2.8

 changes/geoip-january2017 |4 +
 src/config/geoip  | 3160 +
 src/config/geoip6 |  561 +++-
 3 files changed, 2552 insertions(+), 1173 deletions(-)



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

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

2016-12-20 Thread nickm 
commit cb2e2056b5637443715bf494be72d0953c75b4be
Merge: 7f55aaf 2673b4b
Author: Nick Mathewson 
Date:   Tue Dec 20 18:23:35 2016 -0500

Merge branch 'maint-0.2.7' 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/master] Merge branch 'maint-0.2.7' into maint-0.2.8

2016-12-20 Thread nickm 
commit 7f55aaf281473089355c855c2632b2d1a9467ebb
Merge: f62c74c a9c8a5f
Author: Nick Mathewson 
Date:   Tue Dec 20 18:15:26 2016 -0500

Merge branch 'maint-0.2.7' 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/master] Merge branch 'maint-0.2.7' into maint-0.2.8

2016-12-09 Thread nickm 
commit 56a2b8dc6ea3d8438562d5eb7c3595aafd23c04d
Merge: d47c52b b49369b
Author: Nick Mathewson 
Date:   Fri Dec 9 08:34:18 2016 -0500

Merge branch 'maint-0.2.7' into maint-0.2.8

 changes/geoip-december2016 |4 +
 src/config/geoip   | 6259 ++--
 src/config/geoip6  | 1193 -
 3 files changed, 4705 insertions(+), 2751 deletions(-)



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

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

2016-11-07 Thread nickm 
commit 2639fd08e7212bb33c0964b57028c013ce2271aa
Merge: 61bdc45 f5fdf18
Author: Nick Mathewson 
Date:   Mon Nov 7 09:31:36 2016 -0500

Merge branch 'maint-0.2.7' into maint-0.2.8

 changes/geoip-november2016 |4 +
 src/config/geoip   | 4025 
 src/config/geoip6  | 2490 ++-
 3 files changed, 3407 insertions(+), 3112 deletions(-)



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

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

2016-10-06 Thread nickm 
commit ab98c4387eadf380f6fe71b8dc1b568704a379ea
Merge: ec19ecc ec718aa
Author: Nick Mathewson 
Date:   Thu Oct 6 09:59:42 2016 -0400

Merge branch 'maint-0.2.7' into maint-0.2.8

 changes/geoip-october2016 | 4 +
 src/config/geoip  | 63919 +---
 src/config/geoip6 |  1496 +-
 3 files changed, 48664 insertions(+), 16755 deletions(-)



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

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

2016-09-07 Thread nickm 
commit 6494f3346b0e7b8b641c720c2d5c1e8277935f6f
Merge: e9124b8 11edbf4
Author: Nick Mathewson 
Date:   Wed Sep 7 13:54:12 2016 -0400

Merge branch 'maint-0.2.7' into maint-0.2.8

 changes/geoip-september2016 | 4 +
 src/config/geoip| 30846 +-
 src/config/geoip6   |  2373 ++--
 3 files changed, 10566 insertions(+), 22657 deletions(-)



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

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

2016-08-24 Thread nickm 
commit d3a975ea05bf8d850602a3ad8054402a679c5dcf
Merge: 0ba0531 f60da19
Author: Nick Mathewson 
Date:   Wed Aug 24 10:02:52 2016 -0400

Merge branch 'maint-0.2.7' into maint-0.2.8

 changes/bug19728 | 3 +++
 src/or/config.c  | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --cc src/or/config.c
index 908f098,3094a1d..4b065a0
--- a/src/or/config.c
+++ b/src/or/config.c
@@@ -910,11 -869,10 +910,11 @@@ static const char *default_authorities[
"dizum orport=443 "
  "v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 "
  "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
-   "Tonga orport=443 bridge "
- "82.94.251.203:80 4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D",
+   "Bifroest orport=443 bridge "
+ "37.218.247.217:80 1D8F 3A91 C37C 5D1C 4C19 B1AD 1D0C FBE8 BF72 D8E1",
"gabelmoo orport=443 "
  "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
 +"ipv6=[2001:638:a000:4140:::189]:443 "
  "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
"dannenberg orport=443 "
  "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "



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

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

2016-08-12 Thread nickm 
commit 459e5d705eb688642d53f38c00e0a2c6cfd36b8a
Merge: 6b740aa db372ad
Author: Nick Mathewson 
Date:   Fri Aug 12 10:27:14 2016 -0400

Merge branch 'maint-0.2.7' into maint-0.2.8

 changes/geoip-august2016 | 4 +
 src/config/geoip | 14009 +
 src/config/geoip6|  1108 +++-
 3 files changed, 8582 insertions(+), 6539 deletions(-)



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

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

2016-07-19 Thread nickm 
commit 4d5b252f0f0179add75e4c2a2f8ab690864584f3
Merge: fbae15a 4d70ed7
Author: Nick Mathewson 
Date:   Tue Jul 19 12:34:27 2016 +0200

Merge branch 'maint-0.2.7' into maint-0.2.8

 changes/geoip-july2016 |4 +
 src/config/geoip   | 4615 +---
 src/config/geoip6  |  982 ---
 3 files changed, 3879 insertions(+), 1722 deletions(-)



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

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

2016-07-05 Thread nickm 
commit 4f4d77c435d74bdb6359e86ff60c4a4c0d7e45b8
Merge: 8f44d28 7c25b41
Author: Nick Mathewson 
Date:   Tue Jul 5 13:52:18 2016 -0400

Merge branch 'maint-0.2.7' into maint-0.2.8

 changes/19271 | 2 ++
 1 file changed, 2 insertions(+)



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

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

2016-07-05 Thread nickm 
commit f4408747d3e8de35f6beaf37535315b907c87656
Merge: 744077d 6e96aad
Author: Nick Mathewson 
Date:   Tue Jul 5 12:23:14 2016 -0400

Merge branch 'maint-0.2.7' into maint-0.2.8

 src/or/config.c | 5 -
 1 file changed, 5 deletions(-)

diff --cc src/or/config.c
index 0850013,0f36738..908f098
--- a/src/or/config.c
+++ b/src/or/config.c
@@@ -919,14 -877,8 +919,9 @@@ static const char *default_authorities[
"dannenberg orport=443 "
  "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "
  "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
-   "urras orport=80 "
- "v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C "
- "208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417"
- /* XX/teor - urras may have an IPv6 address, but it's not in urras'
-  * descriptor as of 11 Dec 2015. See #17813. */,
"maatuska orport=80 "
  "v3ident=49015F787433103580E3B66A1707A00E60F2D15B "
 +"ipv6=[2001:67c:289c::9]:80 "
  "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810",
"Faravahar orport=443 "
  "v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 "



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

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

2016-06-13 Thread nickm 
commit 2ee3dbe8018aa4c4b1988df77ccc6a6fda753ea9
Merge: ada5668 80089c9
Author: Nick Mathewson 
Date:   Mon Jun 13 10:49:05 2016 -0400

Merge branch 'maint-0.2.7' into maint-0.2.8

 changes/geoip-jun2016 |4 +
 src/config/geoip  | 3349 +++--
 src/config/geoip6 | 1366 
 3 files changed, 3527 insertions(+), 1192 deletions(-)



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

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

2016-06-02 Thread nickm 
commit a32ca313c4bc67d56af5f345fa0129b50c006b12
Merge: f258064 5854b19
Author: Nick Mathewson 
Date:   Thu Jun 2 10:12:56 2016 -0400

Merge branch 'maint-0.2.7' into maint-0.2.8

 changes/bug19213 | 3 +++
 src/test/test_util.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/master] Merge branch 'maint-0.2.7' into maint-0.2.8

2016-05-12 Thread nickm 
commit e8cc9f3edf21ff56ba16cf716e74eb1efba0b0f1
Merge: ce6f2d1 4165b1a
Author: Nick Mathewson 
Date:   Thu May 12 15:33:47 2016 -0400

Merge branch 'maint-0.2.7' into maint-0.2.8

 changes/bug18977| 4 
 src/common/compat.c | 4 
 src/common/util.c   | 2 ++
 3 files changed, 10 insertions(+)




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

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

2016-05-11 Thread arma 
commit 163cee1b6489c8966681b420d6da49e8ff4a9d1f
Merge: 8d96223 d40e869
Author: Roger Dingledine 
Date:   Wed May 11 13:42:40 2016 -0400

Merge branch 'maint-0.2.7' into maint-0.2.8

 src/or/dirserv.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)




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

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

2016-05-11 Thread nickm 
commit 24fbb9a81b19cc20df9a204d3203d1b914fb267d
Merge: 28e1aa1 4e94580
Author: Nick Mathewson 
Date:   Wed May 11 13:15:17 2016 -0400

Merge branch 'maint-0.2.7' into maint-0.2.8

 changes/bug19032   |  4 
 src/or/dirserv.c   | 31 ---
 src/or/dirserv.h   |  2 +-
 src/or/networkstatus.c |  3 +--
 4 files changed, 22 insertions(+), 18 deletions(-)




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

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

2016-05-11 Thread nickm 
commit 50249c7cd97c982fe829a9e7a22e660658b4e217
Merge: 5cd5979 039fc84
Author: Nick Mathewson 
Date:   Wed May 11 12:23:20 2016 -0400

Merge branch 'maint-0.2.7' into maint-0.2.8

 changes/bug18841.1 | 7 +++
 configure.ac   | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --cc configure.ac
index e4816fd,8107c90..a487948
--- a/configure.ac
+++ b/configure.ac
@@@ -760,9 -717,9 +760,9 @@@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], 
  #error
  #endif])], have_clang=yes, have_clang=no)
  
 -if test x$enable_gcc_hardening != xno; then
 +if test "x$enable_gcc_hardening" != "xno"; then
- CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"
+ CFLAGS="$CFLAGS -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2"
 -if test x$have_clang = xyes; then
 +if test "x$have_clang" = "xyes"; then
  TOR_CHECK_CFLAGS(-Qunused-arguments)
  fi
  TOR_CHECK_CFLAGS(-fstack-protector-all, also_link)



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

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

2016-05-09 Thread nickm 
commit 5cd59791328c1a0e6987d83b9b55aeccbbf6eaf4
Merge: 55cf197 61c0bae
Author: Nick Mathewson 
Date:   Mon May 9 18:14:44 2016 -0400

Merge branch 'maint-0.2.7' into maint-0.2.8

 Makefile.am  | 2 +-
 changes/bug19008 | 3 +++
 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/master] Merge branch 'maint-0.2.7' into maint-0.2.8

2016-05-09 Thread nickm 
commit 55cf1970bce222a32c387652fe5080adb2aa1513
Merge: 72601d7 7fe80c2
Author: Nick Mathewson 
Date:   Mon May 9 14:59:18 2016 -0400

Merge branch 'maint-0.2.7' into maint-0.2.8

 changes/geoip-may2016 |4 +
 src/config/geoip  | 6991 -
 src/config/geoip6 |  904 +--
 3 files changed, 4631 insertions(+), 3268 deletions(-)



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

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

2016-04-07 Thread nickm 
commit d8a056daed78c9794037931db81b97d596505bb7
Merge: f6ffe53 ad4ff7a
Author: Nick Mathewson 
Date:   Thu Apr 7 10:46:07 2016 -0400

Merge branch 'maint-0.2.7' into maint-0.2.8

 changes/geoip-april2016 |4 +
 src/config/geoip| 3255 +++
 src/config/geoip6   | 2549 +
 3 files changed, 4455 insertions(+), 1353 deletions(-)



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

[tor-commits] [tor/master] Merge branch 'maint-0.2.7'

2016-03-21 Thread nickm 
commit 6a91cab79c23b47c48e35e95661dfbe81be943dd
Merge: c83bcc3 e1e62f9
Author: Nick Mathewson 
Date:   Mon Mar 21 13:26:04 2016 -0400

Merge branch 'maint-0.2.7'

 changes/bug17668   |  5 
 changes/bug17702   |  6 
 changes/bug18318_ed|  7 +
 changes/bug18368   |  5 
 src/or/dircollate.c| 78 ++
 src/or/dircollate.h| 24 ++--
 src/or/dirserv.c   | 75 +---
 src/or/dirserv.h   |  2 +-
 src/or/dirvote.c   | 35 ++
 src/or/dirvote.h   |  7 +++--
 src/or/networkstatus.c |  2 +-
 src/or/or.h| 13 +++--
 src/or/routerparse.c   | 25 
 13 files changed, 239 insertions(+), 45 deletions(-)

diff --cc src/or/or.h
index 4c295ab,431927c..301901e
--- a/src/or/or.h
+++ b/src/or/or.h
@@@ -2153,11 -2081,10 +2153,15 @@@ typedef struct 
 * tests for it. */
unsigned int needs_retest_if_added:1;
  
 +  /** True iff this router included "tunnelled-dir-server" in its descriptor,
 +   * implying it accepts tunnelled directory requests, or it advertised
 +   * dir_port > 0. */
 +  unsigned int supports_tunnelled_dir_requests:1;
 +
+   /** Used during voting to indicate that we should not include an entry for
+* this routerinfo. Used only during voting. */
+   unsigned int omit_from_vote:1;
+ 
  /** Tor can use this router for general positions in circuits; we got it
   * from a directory server as usual, or we're an authority and a server
   * uploaded it. */

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

[tor-commits] [tor/master] Merge branch 'maint-0.2.7'

2016-03-21 Thread nickm 
commit 3a547076b6ff2a043f7d751426e34b6408754369
Merge: ddd30f9 920e3d6
Author: Nick Mathewson 
Date:   Mon Mar 21 11:01:47 2016 -0400

Merge branch 'maint-0.2.7'

 changes/bug14821| 4 ++--
 changes/bug18162| 2 +-
 changes/geoip-march2016 | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

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

[tor-commits] [tor/master] Merge branch 'maint-0.2.7'

2016-03-09 Thread nickm 
commit 58bcae37a2c63db81c8c0f8fdf47d886f072209a
Merge: 63b4ce1 17cfdb3
Author: Nick Mathewson 
Date:   Wed Mar 9 10:37:00 2016 -0500

Merge branch 'maint-0.2.7'

 changes/geoip-march2016 |4 +
 src/config/geoip| 8496 +++
 src/config/geoip6   | 2270 ++---
 3 files changed, 6524 insertions(+), 4246 deletions(-)

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

[tor-commits] [tor/master] Merge branch 'maint-0.2.7'

2016-02-23 Thread nickm 
commit a7f303a4818b551b4a59a3624cc337294a2703e3
Merge: 94c8f36 67e5d49
Author: Nick Mathewson 
Date:   Tue Feb 23 14:05:54 2016 -0500

Merge branch 'maint-0.2.7'

 changes/bug14821| 4 
 src/common/compat.h | 9 +
 2 files changed, 13 insertions(+)




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

[tor-commits] [tor/master] Merge branch 'maint-0.2.7'

2016-02-11 Thread nickm 
commit 7788ee43e519a8f39e3917c4161e7c635cd2ecd9
Merge: 838d4de be6174f
Author: Nick Mathewson 
Date:   Thu Feb 11 13:04:43 2016 -0500

Merge branch 'maint-0.2.7'

 changes/bug18162   |  7 +++
 src/common/container.c | 36 +++-
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --cc src/common/container.c
index 9f40dfa,8c66bd8..2e42c9e
--- a/src/common/container.c
+++ b/src/common/container.c
@@@ -59,11 -58,16 +59,16 @@@ smartlist_clear(smartlist_t *sl
sl->num_used = 0;
  }
  
+ #if SIZE_MAX < INT_MAX
+ #error "We don't support systems where size_t is smaller than int."
+ #endif
+ 
  /** Make sure that sl can hold at least size entries. */
 -static INLINE void
 +static inline void
- smartlist_ensure_capacity(smartlist_t *sl, int size)
+ smartlist_ensure_capacity(smartlist_t *sl, size_t size)
  {
- #if SIZEOF_SIZE_T > SIZEOF_INT
+   /* Set MAX_CAPACITY to MIN(INT_MAX, SIZE_MAX / sizeof(void*)) */
+ #if (SIZE_MAX/SIZEOF_VOID_P) > INT_MAX
  #define MAX_CAPACITY (INT_MAX)
  #else
  #define MAX_CAPACITY (int)((SIZE_MAX / (sizeof(void*
@@@ -83,11 -83,10 +84,11 @@@
while (size > higher)
  higher *= 2;
  }
 -tor_assert(higher <= INT_MAX); /* Redundant */
 -sl->capacity = (int) higher;
  sl->list = tor_reallocarray(sl->list, sizeof(void *),
 -((size_t)sl->capacity));
 +((size_t)higher));
 +memset(sl->list + sl->capacity, 0,
 +   sizeof(void *) * (higher - sl->capacity));
- sl->capacity = higher;
++sl->capacity = (int) higher;
}
  #undef ASSERT_CAPACITY
  #undef MAX_CAPACITY

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

[tor-commits] [tor/master] Merge branch 'maint-0.2.7'

2016-02-05 Thread nickm 
commit 1f5cdf2b6c72ae89eea630a2c4693273ff1aee6c
Merge: 6149703 d920cbb
Author: Nick Mathewson 
Date:   Fri Feb 5 08:13:47 2016 -0500

Merge branch 'maint-0.2.7'

 changes/geoip-february2016 |4 +
 src/config/geoip   | 2144 +---
 src/config/geoip6  |  864 ++
 3 files changed, 2328 insertions(+), 684 deletions(-)

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

[tor-commits] [tor/master] Merge branch 'maint-0.2.7'

2016-02-01 Thread nickm 
commit 93f3f4ae7ad37ad634c6b210753f940d257942a6
Merge: c6fa55d 6352dde
Author: Nick Mathewson 
Date:   Mon Feb 1 15:53:54 2016 -0500

Merge branch 'maint-0.2.7'

 changes/bug17906 | 4 ++--
 1 file changed, 2 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/master] Merge branch 'maint-0.2.7'

2016-02-01 Thread nickm 
commit 4cd93a6a59236519dee2a1a7ee824904e923189d
Merge: a5bed4d 7d1fe7c
Author: Nick Mathewson 
Date:   Mon Feb 1 09:41:45 2016 -0500

Merge branch 'maint-0.2.7'

(We already had a fix for the address test freebsd issues)

 src/test/test_address.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc src/test/test_address.c
index 3ddf247,4cf3a5a..3b17b23
--- a/src/test/test_address.c
+++ b/src/test/test_address.c
@@@ -511,28 -481,16 +511,28 @@@ test_address_get_if_addrs_ioctl(void *a
  
(void)arg;
  
 -  result = get_interface_addresses_ioctl(LOG_ERR);
 +  result = get_interface_addresses_ioctl(LOG_ERR, AF_INET);
  
 +  /* On an IPv6-only system, this will fail and return NULL
tt_assert(result);
 -  tt_int_op(smartlist_len(result),>=,1);
 +  */
  
 -#ifndef __FreeBSD__
 -  /* FreeBSD doesn't have a localhost in jails sometimes. */
 -  tt_assert(smartlist_contains_localhost_tor_addr(result));
 -#endif
 -  done:
 +  /* Some FreeBSD jails don't have localhost IP address. Instead, they only
 +   * have the address assigned to the jail (whatever that may be).
 +   * And a jail without a network connection might not have any addresses at
 +   * all. */
 +  if (result) {
 +tt_assert(!smartlist_contains_null_tor_addr(result));
 +
 +/* If there are addresses, they must be IPv4 or IPv6.
 + * (AIX supports IPv6 from SIOCGIFCONF.) */
 +if (smartlist_len(result) > 0) {
 +  tt_assert(smartlist_contains_ipv4_tor_addr(result)
 +|| smartlist_contains_ipv6_tor_addr(result));
 +}
 +  }
 +
-   done:
++ done:
if (result) {
  SMARTLIST_FOREACH(result, tor_addr_t *, t, tor_free(t));
  smartlist_free(result);

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

[tor-commits] [tor/master] Merge branch 'maint-0.2.7'

2016-01-28 Thread nickm 
commit a5bed4dab2f8521f744d5137e4f439b073c7e5e9
Merge: 6b2087d 601c823
Author: Nick Mathewson 
Date:   Thu Jan 28 11:53:03 2016 -0500

Merge branch 'maint-0.2.7'

 doc/tor.1.txt |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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

[tor-commits] [tor/master] Merge branch 'maint-0.2.7'

2016-01-28 Thread nickm 
commit 6b2087dbe42e2e4a81b5cac9278f81a97f80a1cb
Merge: 4770db8 fb64c55
Author: Nick Mathewson 
Date:   Thu Jan 28 10:22:06 2016 -0500

Merge branch 'maint-0.2.7'

 changes/bug17583 |4 
 doc/tor.1.txt|   29 +++--
 2 files changed, 31 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/master] Merge branch 'maint-0.2.7'

2016-01-19 Thread nickm 
commit f557a7f327d6574018f836e6d7ba767a6082c491
Merge: 7b6d7aa 534a0ba
Author: Nick Mathewson 
Date:   Tue Jan 19 08:30:48 2016 -0500

Merge branch 'maint-0.2.7'

 src/common/crypto.c |4 +++-
 1 file changed, 3 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/master] Merge branch 'maint-0.2.7'

2016-01-18 Thread nickm 
commit ab58f60321ba6689fc89efb374e3a8ad8cc9808c
Merge: 0ace22e 8335b1f
Author: Nick Mathewson 
Date:   Mon Jan 18 20:03:28 2016 -0500

Merge branch 'maint-0.2.7'

 changes/bug18089|6 ++
 src/common/crypto.c |8 
 2 files changed, 14 insertions(+)

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

[tor-commits] [tor/master] Merge branch 'maint-0.2.7'

2016-01-07 Thread nickm 
commit 55232e32c73b114dbe8de643ff0f352e252457ac
Merge: b5ce332 b34c5c6
Author: Nick Mathewson 
Date:   Thu Jan 7 09:43:24 2016 -0800

Merge branch 'maint-0.2.7'

 changes/bug17906 |4 
 src/or/config.c  |2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --cc src/or/config.c
index ff25a79,3b35b5a..c1db844
--- a/src/or/config.c
+++ b/src/or/config.c
@@@ -914,10 -873,9 +914,10 @@@ static const char *default_authorities[
  "82.94.251.203:80 4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D",
"gabelmoo orport=443 "
  "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
 +"ipv6=[2001:638:a000:4140:::189]:443 "
  "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
"dannenberg orport=443 "
- "v3ident=585769C78764D58426B8B52B6651A5A71137189A "
+ "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "
  "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
"urras orport=80 "
  "v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C "

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

[tor-commits] [tor/master] Merge branch 'maint-0.2.7'

2015-12-22 Thread nickm 
commit ff3e90070fd21788ac2c1c9116f18c9b888c750a
Merge: b9596b8 d0c209c
Author: Nick Mathewson 
Date:   Tue Dec 22 20:38:33 2015 -0500

Merge branch 'maint-0.2.7'

 changes/bug17923 |4 
 configure.ac |1 -
 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/master] Merge branch 'maint-0.2.7'

2015-12-17 Thread nickm 
commit 8585cc57f8fc2233ff27a66509320ec0ab34d563
Merge: 54d9632 2cbaf39
Author: Nick Mathewson 
Date:   Thu Dec 17 14:57:16 2015 -0500

Merge branch 'maint-0.2.7'

 changes/bug17675 |4 
 src/or/main.c|3 +++
 2 files changed, 7 insertions(+)

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

[tor-commits] [tor/master] Merge branch 'maint-0.2.7'

2015-12-16 Thread nickm 
commit a5da27cb35987bdab7a9ebec907056be974289a5
Merge: 9d17d10 784e9ff
Author: Nick Mathewson 
Date:   Wed Dec 16 09:07:11 2015 -0500

Merge branch 'maint-0.2.7'

 src/common/sandbox.c |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/master] Merge branch 'maint-0.2.7'

2015-12-16 Thread nickm 
commit 3317cd3a1f4e3a7883bf9a5eba3f9a13097fe437
Merge: a5da27c 33b5bfb
Author: Nick Mathewson 
Date:   Wed Dec 16 09:24:40 2015 -0500

Merge branch 'maint-0.2.7'

 changes/bug17819 |4 
 configure.ac |1 +
 src/common/compat_pthreads.c |3 ++-
 3 files changed, 7 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/master] Merge branch 'maint-0.2.7'

2015-12-15 Thread nickm 
commit fec5aa75f4c50f6b307edbc7662bdb9c5a73f617
Merge: b463773 07cca62
Author: Nick Mathewson 
Date:   Tue Dec 15 11:55:46 2015 -0500

Merge branch 'maint-0.2.7'

 changes/bug17827   |3 +++
 src/common/backtrace.c |   16 
 src/common/backtrace.h |2 +-
 src/common/sandbox.c   |2 +-
 4 files changed, 13 insertions(+), 10 deletions(-)

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

[tor-commits] [tor/master] Merge branch 'maint-0.2.7'

2015-12-14 Thread nickm 
commit 39b2f2d35e1c6638332846ed9df75f77ea114df5
Merge: f3ed5ec ff843ed
Author: Nick Mathewson 
Date:   Mon Dec 14 13:21:16 2015 -0500

Merge branch 'maint-0.2.7'

 Makefile.am |7 +++
 changes/bug17818|3 +++
 src/or/include.am   |3 ---
 src/test/include.am |   11 ++-
 4 files changed, 16 insertions(+), 8 deletions(-)

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

[tor-commits] [tor/master] Merge branch 'maint-0.2.7'

2015-12-14 Thread nickm 
commit 9a179ff75159476ef475a28bae2615cd7e2e4df7
Merge: 39b2f2d 254d63d
Author: Nick Mathewson 
Date:   Mon Dec 14 15:45:54 2015 -0500

Merge branch 'maint-0.2.7'

 src/test/include.am |5 -
 1 file 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/master] Merge branch 'maint-0.2.7'

2015-12-10 Thread nickm 
commit d015c70a118e43577a3821433970c4367cc8982f
Merge: 9f6b9e2 aa40f28
Author: Nick Mathewson 
Date:   Thu Dec 10 14:25:14 2015 -0500

Merge branch 'maint-0.2.7'

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

[tor-commits] [tor/master] Merge branch 'maint-0.2.7'

2015-12-10 Thread nickm 
commit 7e0da695e0f0485da1c91c1dd7a4919b273acf01
Merge: 81c06b1 7fb19f1
Author: Nick Mathewson 
Date:   Thu Dec 10 10:05:29 2015 -0500

Merge branch 'maint-0.2.7'

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

[tor-commits] [tor/master] Merge branch 'maint-0.2.7'

2015-12-08 Thread nickm 
commit 252149e8b4697c570097acd514c433b8215f24dd
Merge: b585cf3 c6a3375
Author: Nick Mathewson 
Date:   Tue Dec 8 10:23:56 2015 -0500

Merge branch 'maint-0.2.7'

 changes/bug17772|7 +++
 src/or/routerlist.c |   10 --
 2 files changed, 15 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/master] Merge branch 'maint-0.2.7'

2015-12-08 Thread nickm 
commit b585cf3ca38a947450cafacaef4d85db6c377635
Merge: 95c03b2 eeb9751
Author: Nick Mathewson 
Date:   Tue Dec 8 09:44:01 2015 -0500

Merge branch 'maint-0.2.7'

 changes/bug17781 |3 +++
 1 file changed, 3 insertions(+)

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

[tor-commits] [tor/master] Merge branch 'maint-0.2.7'

2015-12-08 Thread nickm 
commit 1321608786c452ab9f0bf19f37509938f7755117
Merge: d6adb26 e9bf584
Author: Nick Mathewson 
Date:   Tue Dec 8 08:45:09 2015 -0500

Merge branch 'maint-0.2.7'

 changes/bug16056  |4 
 src/or/policies.c |6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

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

[tor-commits] [tor/master] Merge branch 'maint-0.2.7'

2015-12-07 Thread nickm 
commit 0ec6757091434612c4f956b9ccdee6089f408564
Merge: ee5337e 9c66afe
Author: Nick Mathewson 
Date:   Mon Dec 7 10:11:54 2015 -0500

Merge branch 'maint-0.2.7'

 changes/geoip-december2015 |4 +
 src/config/geoip   | 4547 
 src/config/geoip6  | 2580 +
 3 files changed, 5512 insertions(+), 1619 deletions(-)

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

[tor-commits] [tor/master] Merge branch 'maint-0.2.7'

2015-11-30 Thread nickm 
commit ee5337e90497e31c1ef18630c4f089e70bda5269
Merge: 7ff18cc e408aa3
Author: Nick Mathewson 
Date:   Mon Nov 30 22:03:00 2015 -0500

Merge branch 'maint-0.2.7'

 changes/bug17722 |3 +++
 src/or/torcert.c |6 +-
 2 files changed, 8 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/master] Merge branch 'maint-0.2.7'

2015-11-25 Thread nickm 
commit be30c61ac1553cf4401c832019e213be907c0711
Merge: 6cdd024 273b267
Author: Nick Mathewson 
Date:   Wed Nov 25 08:53:46 2015 -0500

Merge branch 'maint-0.2.7'

 changes/bug16702 |4 
 src/or/rendservice.c |3 ++-
 2 files changed, 6 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/master] Merge branch 'maint-0.2.7'

2015-11-25 Thread nickm 
commit 62aad9c0b6812d04cfca3ec9e104d8ee2cbebb7c
Merge: fe8eb9b 232ccc1
Author: Nick Mathewson 
Date:   Wed Nov 25 09:28:44 2015 -0500

Merge branch 'maint-0.2.7'

 changes/bug17551 |4 
 configure.ac |3 +++
 2 files changed, 7 insertions(+)

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

[tor-commits] [tor/master] Merge branch 'maint-0.2.7'

2015-11-20 Thread nickm 
commit 8a41d2a1d9eb65268d0f36e39d0ade77f5a39307
Merge: 35bfd78 18ee193
Author: Nick Mathewson 
Date:   Fri Nov 20 10:28:43 2015 -0500

Merge branch 'maint-0.2.7'

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