sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'maint-0.2.8' into release-0.2.8

This commit is contained in:
Nick Mathewson 2016-07-29 10:23:29 -04:00
parent 845d3fefac 1c4a2dd208
commit 258988ca51
8 changed files with 3890 additions and 1729 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug19782 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes (fallback directories):
- Remove a fallback that was on the hardcoded list, then opted-out.
Fixes bug 19782; update to fallback list from 0.2.8.2-alpha.

4
changes/geoip-july2016 Normal file
View File

@ -0,0 +1,4 @@
o Minor features:
- Update geoip and geoip6 to the July 6 2016 Maxmind GeoLite2
Country database.

3
scripts/maint/fallback.blacklist
View File

@ -224,3 +224,6 @@ id=9C8A123081EFBE022EF795630F447839DDFDDDEC
81.7.17.171:80 orport=443 id=CFECDDCA990E3EF7B7EC958B22441386B6B8D820 ipv6=[2a02:180:1:1::517:11ab]:443
51.254.215.121:80 orport=443 id=262B66AD25C79588AD1FC8ED0E966395B47E5C1D
185.100.85.138:80 orport=46356 id=5C4DF16A0029CC4F67D3E127356E68F219269859
# Fallback was on 0.2.8.2-alpha list, but opted-out before 0.2.8.6
37.187.1.149:9030 orport=9001 id=08DC0F3C6E3D9C527C1FC8745D35DD1B0DE1875D ipv6=[2001:41d0:a:195::1]:9001

3
scripts/maint/fallback.whitelist
View File

@ -334,9 +334,6 @@
# Email sent directly to teor, verified using relay contact info
195.191.233.221:80 orport=443 id=DE134FC8E5CC4EC8A5DE66934E70AC9D70267197
# Email sent directly to teor, verified using relay contact info
37.187.1.149:9030 orport=9001 id=08DC0F3C6E3D9C527C1FC8745D35DD1B0DE1875D ipv6=[2001:41d0:a:195::1]:9001
# Email sent directly to teor, verified using relay contact info
62.210.238.33:9030 orport=9001 id=FDF845FC159C0020E2BDDA120C30C5C5038F74B4

1
src/common/sandbox.c
View File

@ -608,7 +608,6 @@ sb_socket(scmp_filter_ctx ctx, sandbox_cfg_t *filter)
const int pf = i ? PF_INET : PF_INET6;
for (j=0; j < 3; ++j) {
const int type = (j == 0) ? SOCK_STREAM :
(j == 1) ? SOCK_DGRAM :
SOCK_DGRAM;
const int protocol = (j == 0) ? IPPROTO_TCP :
(j == 1) ? IPPROTO_IP :

4615
src/config/geoip
View File

File diff suppressed because it is too large Load Diff

982
src/config/geoip6
View File

File diff suppressed because it is too large Load Diff

8
src/or/fallback_dirs.inc
View File

@ -19,9 +19,11 @@ URL: https:onionoo.torproject.orguptime?first_seen_days=7-&flag=V2Dir&type=relay
"5.9.110.236:9030 orport=9001 id=0756B7CD4DFC8182BE23143FAC0642F515182CEB"
" ipv6=[2a01:4f8:162:51e2::2]:9001"
" weight=10",
"37.187.1.149:9030 orport=9001 id=08DC0F3C6E3D9C527C1FC8745D35DD1B0DE1875D"
" ipv6=[2001:41d0:a:195::1]:9001"
" weight=10",
/* Fallback was on 0.2.8.2-alpha list, but opted-out before 0.2.8.6
* "37.187.1.149:9030 orport=9001 id=08DC0F3C6E3D9C527C1FC8745D35DD1B0DE1875D"
* " ipv6=[2001:41d0:a:195::1]:9001"
* " weight=10",
*/
"5.39.92.199:80 orport=443 id=0BEA4A88D069753218EAAAD6D22EA87B9A1319D6"
" weight=10",
"5.196.88.122:9030 orport=9001 id=0C2C599AFCB26F5CFC2C7592435924C1D63D9484"