[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [ooni-probe/master] Remove raw inputs and move them to a separate repository



commit 92bbcb9b66b1eb1716bbc5f7d8ff2cf46c70347a
Author: Arturo Filastò <arturo@xxxxxxxxxxx>
Date:   Wed Nov 7 01:36:08 2012 +0100

    Remove raw inputs and move them to a separate repository
    * Add Makefile to fetch such lists
---
 inputs/Makefile                      |    3 +
 inputs/captive_portal_tests.txt.good |    4 -
 inputs/cctld.txt                     |  511 ----------------------
 inputs/dns_servers.txt.bak           |    6 -
 inputs/dns_servers.txt.bak2          |    1 -
 inputs/example_exp_list.txt          |    3 -
 inputs/major_isp_dns_servers.txt     |  796 ----------------------------------
 inputs/short_hostname_list.txt       |    7 -
 inputs/tld-list-cc.txt               |  511 ----------------------
 inputs/tld-list-mozilla.txt          |    5 -
 inputs/top-1m.txt.bak2               |   11 -
 11 files changed, 3 insertions(+), 1855 deletions(-)

diff --git a/inputs/Makefile b/inputs/Makefile
new file mode 100644
index 0000000..c70ce59
--- /dev/null
+++ b/inputs/Makefile
@@ -0,0 +1,3 @@
+# This file will fetch a set of inputs that are of use to ooni-probe
+lists:
+	git clone https://github.com/hellais/ooni-inputs.git ooni-inputs
diff --git a/inputs/captive_portal_tests.txt.good b/inputs/captive_portal_tests.txt.good
deleted file mode 100644
index 1bd016f..0000000
--- a/inputs/captive_portal_tests.txt.good
+++ /dev/null
@@ -1,4 +0,0 @@
-
-http://ooni.nu, Open Observatory of Network Interference, 200
-http://www.patternsinthevoid.net/2CDB8B35pub.asc, mQINBE5qkHABEADVnasCm9w9hUff1E4iKnzcAdp4lx6XU5USmYdwKg2RQt2VFqWQ, 200
-http://www.google.com, Search the world's information, 200
diff --git a/inputs/cctld.txt b/inputs/cctld.txt
deleted file mode 100644
index 57e0cc8..0000000
--- a/inputs/cctld.txt
+++ /dev/null
@@ -1,511 +0,0 @@
-.ac = Ascension Island
-
-.ad = Andorra
-
-.ae = United Arab Emirates
-
-.af = Afghanistan
-
-.ag = Antigua and Barbuda
-
-.ai = Anguilla
-
-.al = Albania
-
-.am = Armenia
-
-.an = Netherlands Antilles
-
-.ao = Angola
-
-.aq = Antarctica - no registrar
-
-.ar = Argentina
-
-.as = American Samoa
-
-.at = Austria
-
-.au = Australia
-
-.aw = Aruba - no registrar
-
-.ax = Aland Islands
-
-.az = Azerbaijan - no registrar
-
-.ba = Bosnia and Herzegovina
-
-.bb = Barbados
-
-.bd = Bangladesh - no registrar
-
-.be = Belgium
-
-.bf = Burkina Faso - no registrar
-
-.bg = Bulgaria
-
-.bh = Bahrain
-
-.bi = Burundi
-
-.bj = Benin ... (little info) DETAILS
-
-.bm = Bermuda
-
-.bn = Brunei Darussalam
-
-.bo = Bolivia
-
-.br = Brazil
-
-.bs = Bahamas
-
-.bt = Bhutan
-
-.bv = Bouvet Island - not in use
-
-.bw = Botswana - no registrar
-
-.by = Belarus
-
-.bz = Belize
-
-.ca = Canada
-
-.cc = Cocos (Keeling) Islands
-
-.cd = The Democratic Republic of the Congo
-
-.cf = Central African Republic - no registrar
-
-.cg = Republic of Congo
-
-.ch = Switzerland
-
-.ci = Cote d'Ivoire
-
-.ck = Cook Islands
-
-.cl = Chile
-
-.cm = Cameroon - no registrar - wildcarded
-
-.cn = China
-
-.co = Colombia
-
-.cr = Costa Rica
-
-.cs = (former) Serbia and Montenegro - no registrar - see: .me
-(.cs was also formerly the ISO_3166-1 code for Czechoslovakia, now .cs is closed.)
-
-.cu = Cuba - no registrar
-
-.cv = Cape Verde - no registrar
-
-.cx = Christmas Island
-
-.cy = Cyprus
-
-.cz = Czech Republic
-
-.dd = East Germany (obsolete)
-
-.de = Germany
-
-.dj = Djibouti - no information
-
-.dk = Denmark
-
-.dm = Dominica
-
-.do = Dominican Republic
-
-.dz = Algeria - no registrar
-
-.ec = Ecuador
-
-.ee = Estonia
-
-.eg = Egypt - DETAILS
-
-.eh = Western Sahara - no registrar
-
-.er = Eritrea - no registrar
-
-.es = Spain
-
-.et = Ethiopia
-
-.eu = European Union - DETAILS
-
-.fi = Finland
-
-.fj = Fiji
-
-.fk = Falkland Islands (Malvinas)
-
-.fm = Micronesia, Federal State of
-
-.fo = Faroe Islands
-
-.fr = France
-
-.ga = Gabon - no registrar
-
-.gb = Great Britain (United Kingdom) - reserved, see .uk
-
-.gd = Grenada
-
-.ge = Georgia
-
-.gf = French Guiana
-
-.gg = Guernsey
-
-.gh = Ghana
-
-.gi = Gibraltar
-
-.gl = Greenland
-
-.gm = Gambia
-
-.gn = Guinea
-
-.gp = Guadeloupe - no information
-
-.gq = Equatorial Guinea - no information
-
-.gr = Greece
-
-.gs = South Georgia and the
-South Sandwich Islands
-
-.gt = Guatemala
-
-.gu = Guam
-
-.gw = Guinea-Bissau - no registrar
-
-.gy = Guyana - no registrar
-
-.hk = Hong Kong
-
-.hm = Heard and McDonald Islands
-
-.hn = Honduras
-
-.hr = Croatia/Hrvatska
-
-.ht = Haiti - no registrar
-
-.hu = Hungary
-
-.id = Indonesia - no information
-
-.ie = Ireland
-
-.il = Israel
-
-.im = Isle of Man
-
-.in = India
-
-.io = British Indian Ocean Territory
-
-.iq = Iraq - no registrar
-
-.ir = Islamic Republic of Iran
-
-.is = Iceland
-
-.it = Italy
-
-.je = Jersey
-
-.jm = Jamaica - no registrar
-
-.jo = Jordan
-
-.jp = Japan
-
-.ke = Kenya
-
-.kg = Kyrgyzstan - no registrar
-
-.kh = Cambodia
-
-.ki = Kiribati
-
-.km = Comoros
-
-.kn = Saint Kitts and Nevis - no registrar
-
-.kp = Democratic People's Republic of Korea
-(North) - no registrar
-
-.kr = Republic of Korea (South)
-
-.kw = Kuwait - no registrar
-
-.ky = Cayman Islands
-
-.kz = Kazakhstan
-
-.la = Lao People's Democratic Republic (Laos)
-... DETAILS
-
-.lb = Lebanon
-
-.lc = Saint Lucia
-
-.li = Liechtenstein
-
-.lk = Sri Lanka
-
-.lr = Liberia
-
-.ls = Lesotho - no registrar
-
-.lt = Lithuania
-
-.lu = Luxembourg
-
-.lv = Latvia
-
-.ly = Libyan Arab Jamahiriya (Libya)
-
-.ma = Morocco
-
-.mc = Monaco
-
-.md = Moldova
-
-.me = Montenegro
-
-.mg = Madagascar
-
-.mh = Marshall Islands
-
-.mk = Macedonia
-
-.ml = Mali - no information
-
-.mm = Myanmar (formerly Burma) - no registrar
-
-.mn = Mongolia
-
-.mo = Macau
-
-.mp = Northern Mariana Islands
-
-.mq = Martinique - no information
-
-.mr = Mauritania
-
-.ms = Montserrat
-
-.mt = Malta
-
-.mu = Mauritius
-
-.mv = Maldives - no registrar
-
-.mw = Malawi
-
-.mx = Mexico
-
-.my = Malaysia
-
-.mz = Mozambique - no registrar
-
-.na = Namibia
-
-.nc = New Caledonia
-
-.ne = Niger - no information
-
-.nf = Norfolk Island
-
-.ng = Nigeria
-
-.ni = Nicaragua
-
-.nl = Netherlands
-
-.no = Norway
-
-.np = Nepal
-
-.nr = Nauru
-
-.nu = Niue
-
-.nz = New Zealand
-
-.om = Oman - Omantel.net.om not functioning
-
-.pa = Panama
-
-.pe = Peru
-
-.pf = French Polynesia - no registrar
-
-.pg = Papua New Guinea - no registrar
-
-.ph = Philippines
-
-.pk = Pakistan
-
-.pl = Poland
-
-.pm = Saint Pierre and Miquelon - not available
-
-.pn = Pitcairn Island
-
-.pr = Puerto Rico
-
-.ps = Palestinian Territories
-
-.pt = Portugal
-
-.pw = Palau
-
-.py = Paraguay
-
-.qa = Qatar
-
-.re = Reunion Island
-
-.ro = Romania
-
-.rs = Serbia - no registrar
-
-.ru = Russian Federation
-
-.rw = Rwanda
-
-.sa = Saudi Arabia
-
-.sb = Solomon Islands
-
-.sc = Seychelles
-
-.sd = Sudan
-
-.se = Sweden
-
-.sg = Singapore
-
-.sh = Saint Helena
-
-.si = Slovenia
-
-.sj = Svalbard and Jan Mayen Islands - not in use
-
-.sk = Slovak Republic
-
-.sl = Sierra Leone
-
-.sm = San Marino
-
-.sn = Senegal - no registrar
-
-.so = Somalia - no registrar
-
-.sr = Suriname
-
-.st = Sao Tome and Principe
-
-.su = Soviet Union
-
-.sv = El Salvador
-
-.sy = Syrian Arab Republic
-
-.sz = Swaziland
-
-.tc = Turks and Caicos Islands - no registrar
-
-.td = Chad - no registrar
-
-.tf = French Southern Territories - no registrar
-
-.tg = Togo
-
-.th = Thailand
-
-.tj = Tajikistan
-
-.tk = Tokelau
-
-.tl = Timor-Leste
-
-.tm = Turkmenistan
-
-.tn = Tunisia
-
-.to = Tonga
-
-.tp = East Timor - Closed. See: Timor-Leste
-
-.tr = Turkey
-
-.tt = Trinidad and Tobago
-
-.tv = Tuvalu
-
-.tw = Taiwan
-
-.tz = Tanzania
-
-.ua = Ukraine
-
-.ug = Uganda
-
-.uk = United Kingdom
-
-.um = United States Minor Outlying Islands
-- Withdrawn, no domains exist.
-
-.us = United States (USA)
-
-.uy = Uruguay
-
-.uz = Uzbekistan
-
-.va = Holy See (Vatican City State)- no registrar
-
-.vc = Saint Vincent and the Grenadines
-
-.ve = Venezuela
-
-.vg = British Virgin Islands
-
-.vi = U.S. Virgin Islands
-
-.vn = Vietnam
-
-.vu = Vanuatu
-
-.wf = Wallis and Futuna Islands - no registrar
-
-.ws = Western Samoa
-
-.ye = Yemen - no registrar
-
-.yt = Mayotte - no registrar
-
-.yu = Yugoslavia Withdrawn in favor of .me and .rs
-
-.za = South Africa
-
-.zm = Zambia - no registrar
-
-.zr = Zaire - Obsolete
-now: The Democratic Republic of the Congo (.cd)
-
-.zw = Zimbabwe - no registrar
diff --git a/inputs/dns_servers.txt.bak b/inputs/dns_servers.txt.bak
deleted file mode 100644
index 844e8d5..0000000
--- a/inputs/dns_servers.txt.bak
+++ /dev/null
@@ -1,6 +0,0 @@
-209.244.0.3
-209.244.0.4
-208.67.222.222
-208.67.220.220
-156.154.70.1
-156.154.71.1
diff --git a/inputs/dns_servers.txt.bak2 b/inputs/dns_servers.txt.bak2
deleted file mode 100644
index 0c4b6f6..0000000
--- a/inputs/dns_servers.txt.bak2
+++ /dev/null
@@ -1 +0,0 @@
-192.168.1.1
diff --git a/inputs/example_exp_list.txt b/inputs/example_exp_list.txt
deleted file mode 100644
index 42ab976..0000000
--- a/inputs/example_exp_list.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-86.59.30.36
-38.229.72.14
-38.229.72.16
diff --git a/inputs/major_isp_dns_servers.txt b/inputs/major_isp_dns_servers.txt
deleted file mode 100644
index 36b8098..0000000
--- a/inputs/major_isp_dns_servers.txt
+++ /dev/null
@@ -1,796 +0,0 @@
-######################################
-## ISP DNS SERVERS BY COUNTRY
-######################################
-## USA
-######################################
-##
-## AT&T
-68.94.156.1
-68.94.157.1
-##
-## ACS Alaska
-209.193.4.7
-209.112.160.2
-##
-## AOL
-205.188.146.145
-##
-## Century Link
-207.14.235.234
-67.238.98.162
-74.4.19.187
-##
-## Charter
-24.296.64.53
-##
-## Cincinnati Bell, ZoomTown
-216.68.4.10
-216.68.5.10
-##
-## Cincinnati Bell, Fuze
-216.68.1.100
-216.68.2.100
-##
-## Comcast, General DNS Servers
-## West Coast
-68.87.85.98
-2001:558:1004:6:68:87:85:98
-## East Coast
-68.87.64.146
-2001:558:1002:B:68:87:64:146
-##
-## Comcast, Albuquerque
-68.87.85.98
-68.87.69.146
-2001:558:1004:6:68:87:85:98
-2001:558:100C:D:68:87:69:146
-##
-## Comcast, Atlanta
-68.87.68.162
-68.87.74.162
-2001:558:100A:4:68:87:68:162
-2001:558:1012:6:68:87:74:162
-##
-## Comcast, Augusta
-68.87.68.162
-68.87.74.162
-2001:558:100A:4:68:87:68:162
-2001:558:1012:6:68:87:74:162
-##
-## Comcast, Battle Creek
-68.87.77.130
-68.87.72.130
-2001:558:1016:C:68:87:77:130
-2001:558:100E:4:68:87:72:130
-##
-## Comcast, Charleston
-68.87.68.162
-68.87.74.162
-2001:558:100A:4:68:87:68:162
-2001:558:1012:6:68:87:74:162
-##
-## Comcast, Chattanooga
-68.87.68.162
-68.87.74.162
-2001:558:100A:4:68:87:68:162
-2001:558:1012:6:68:87:74:162
-##
-## Comcast, Chesterfield
-68.87.73.242
-68.87.71.226
-2001:558:1010:8:68:87:73:242
-2001:558:1000:E:68:87:71:226
-##
-## Comcast, Chicago
-68.87.72.130
-68.87.77.130
-2001:558:100E:4:68:87:72:130
-2001:558:1016:C:68:87:77:130
-##
-## Comcast, Colorado
-68.87.85.98
-68.87.69.146
-2001:558:1004:6:68:87:85:98
-2001:558:100C:D:68:87:69:146
-##
-## Comcast, Connecticut
-68.87.71.226
-68.87.73.242
-2001:558:1000:E:68:87:71:226
-2001:558:1010:8:68:87:73:242
-##
-## Comcast, Dallas
-68.87.68.162
-68.87.74.162
-2001:558:100A:4:68:87:68:162
-2001:558:1012:6:68:87:74:162
-##
-## Comcast, East Tennessee
-68.87.68.162
-68.87.74.162
-2001:558:100A:4:68:87:68:162
-2001:558:1012:6:68:87:74:162
-##
-## Comcast, Elyria
-68.87.75.194
-68.87.64.146
-2001:558:1001:C:68:87:75:194
-2001:558:1002:B:68:87:64:146
-##
-## Comcast, Fort Wayne
-68.87.72.130
-68.87.77.130
-2001:558:100E:4:68:87:72:130
-2001:558:1016:C:68:87:77:130
-##
-## Comcast, Fresno
-68.87.76.178
-68.87.78.130
-2001:558:1014:F:68:87:76:178
-2001:558:1018:6:68:87:78:130
-##
-## Comcast, Hattiesburg-Laurel
-68.87.68.162
-68.87.74.162
-2001:558:100A:4:68:87:68:162
-2001:558:1012:6:68:87:74:162
-##
-## Comcast, Huntsville
-68.87.68.162
-68.87.74.162
-2001:558:100A:4:68:87:68:162
-2001:558:1012:6:68:87:74:162
-##
-## Comcast, Illinois
-68.87.72.130
-68.87.77.130
-2001:558:100E:4:68:87:72:130
-2001:558:1016:C:68:87:77:130
-##
-## Comcast, Independence
-68.87.72.130
-68.87.77.130
-2001:558:100E:4:68:87:72:130
-2001:558:1016:C:68:87:77:130
-##
-## Comcast, Indianapolis
-68.87.72.130
-68.87.77.130
-2001:558:100E:4:68:87:72:130
-2001:558:1016:C:68:87:77:130
-##
-## Comcast, Jacksonville
-68.87.74.162
-68.87.68.162
-2001:558:1012:6:68:87:74:162
-2001:558:100A:4:68:87:68:162
-##
-## Comcast, Knoxville
-68.87.68.162
-68.87.74.162
-2001:558:100A:4:68:87:68:162
-2001:558:1012:6:68:87:74:162
-##
-## Comcast, Lake County
-68.87.74.162
-68.87.68.162
-2001:558:1012:6:68:87:74:162
-2001:558:100A:4:68:87:68:162
-##
-## Comcast, Little Rock
-68.87.68.162
-68.87.74.162
-2001:558:100A:4:68:87:68:162
-2001:558:1012:6:68:87:74:162
-##
-## Comcast, Los Angeles
-68.87.76.178
-68.87.78.130
-2001:558:1014:F:68:87:76:178
-2001:558:1018:6:68:87:78:130
-##
-## Comcast, Massachusetts
-68.87.71.226
-68.87.73.242
-2001:558:1000:E:68:87:71:226
-2001:558:1010:8:68:87:73:242
-##
-## Comcast, Meridian
-68.87.68.162
-68.87.74.162
-2001:558:100A:4:68:87:68:162
-2001:558:1012:6:68:87:74:162
-## Comcast, Miami
-68.87.74.162
-68.87.68.162
-2001:558:1012:6:68:87:74:162
-2001:558:100A:4:68:87:68:162
-##
-## Comcast, Michigan
-68.87.77.130
-68.87.72.130
-2001:558:1016:C:68:87:77:130
-2001:558:100E:4:68:87:72:130
-## Comcast, Minnesota
-68.87.77.130
-68.87.72.130
-2001:558:1016:C:68:87:77:130
-2001:558:100E:4:68:87:72:130
-##
-## Comcast, Mobile
-68.87.68.162
-68.87.74.162
-2001:558:100A:4:68:87:68:162
-2001:558:1012:6:68:87:74:162
-##
-## Comcast, Muncie
-68.87.72.130
-68.87.77.130
-2001:558:100E:4:68:87:72:130
-2001:558:1016:C:68:87:77:130
-##
-## Comcast, Naples
-68.87.74.162
-68.87.68.162
-2001:558:1012:6:68:87:74:162
-2001:558:100A:4:68:87:68:162
-##
-## Comcast, Nashville
-68.87.68.162
-68.87.74.162
-2001:558:100A:4:68:87:68:162
-2001:558:1012:6:68:87:74:162
-##
-## Comcast, New England
-68.87.71.226
-68.87.73.242
-2001:558:1000:E:68:87:71:226
-2001:558:1010:8:68:87:73:242
-##
-## Comcast, Olathe
-68.87.72.130
-68.87.77.130
-2001:558:100E:4:68:87:72:130
-2001:558:1016:C:68:87:77:130
-##
-## Comcast, Oregon
-68.87.69.146
-68.87.85.98
-2001:558:100C:D:68:87:69:146
-2001:558:1004:6:68:87:85:98
-##
-## Comcast, Paducah
-68.87.72.130
-68.87.77.130
-2001:558:100E:4:68:87:72:130
-2001:558:1016:C:68:87:77:130
-##
-## Comcast, Panama City
-68.87.74.162
-68.87.68.162
-2001:558:1012:6:68:87:74:162
-2001:558:100A:4:68:87:68:162
-##
-## Comcast, Pennsylvania
-68.87.75.194
-68.87.64.146
-2001:558:1001:C:68:87:75:194
-2001:558:1002:B:68:87:64:146
-##
-## Comcast, Philadelphia
-68.87.64.146
-68.87.75.194
-2001:558:1002:B:68:87:64:146
-2001:558:1001:C:68:87:75:194
-##
-## Comcast, Pima
-68.87.85.98
-68.87.69.146
-2001:558:1004:6:68:87:85:98
-2001:558:100C:D:68:87:69:146
-##
-## Comcast, Richmond
-68.87.73.242
-68.87.71.226
-2001:558:1010:8:68:87:73:242
-2001:558:1000:E:68:87:71:226
-##
-## Comcast, Sacramento
-68.87.76.178
-68.87.78.130
-2001:558:1014:F:68:87:76:178
-2001:558:1018:6:68:87:78:130
-##
-## Comcast, San Francisco Bay Area
-68.87.76.178
-68.87.78.130
-2001:558:1014:F:68:87:76:178
-2001:558:1018:6:68:87:78:130
-##
-## Comcast, Savannah
-68.87.68.162
-68.87.74.162
-2001:558:100A:4:68:87:68:162
-2001:558:1012:6:68:87:74:162
-##
-## Comcast, South Bend
-68.87.72.130
-68.87.77.130
-2001:558:100E:4:68:87:72:130
-2001:558:1016:C:68:87:77:130
-##
-## Comcast, Spokane
-68.87.69.146
-68.87.85.98
-2001:558:100C:D:68:87:69:146
-2001:558:1004:6:68:87:85:98
-##
-## Comcast, Stockton
-68.87.76.178
-68.87.78.130
-2001:558:1014:F:68:87:76:178
-2001:558:1018:6:68:87:78:130
-##
-## Comcast, Tallahassee
-68.87.74.162
-68.87.68.162
-2001:558:1012:6:68:87:74:162
-2001:558:100A:4:68:87:68:162
-##
-## Comcast, Texas
-68.87.85.98
-68.87.69.146
-2001:558:1004:6:68:87:85:98
-2001:558:100C:D:68:87:69:146
-##
-## Comcast, Tuscaloosa
-68.87.68.162
-68.87.74.162
-2001:558:100A:4:68:87:68:162
-2001:558:1012:6:68:87:74:162
-##
-## Comcast, Utah
-68.87.85.98
-68.87.69.146
-2001:558:1004:6:68:87:85:98
-2001:558:100C:D:68:87:69:146
-##
-## Comcast, Washington
-68.87.69.146
-68.87.85.98
-2001:558:100C:D:68:87:69:146
-2001:558:1004:6:68:87:85:98
-##
-## Comcast, Washington DC
-68.87.73.242
-68.87.71.226
-2001:558:1010:8:68:87:73:242
-2001:558:1000:E:68:87:71:226
-##
-## Comcast, West Florida
-68.87.74.162
-68.87.68.162
-2001:558:1012:6:68:87:74:162
-2001:558:100A:4:68:87:68:162
-##
-## Earthlink
-207.69.188.185
-207.69.188.186
-207.69.188.187
-##
-############################
-## UK
-############################
-##
-## AAISP
-217.169.20.20
-217.169.20.21
-2001:8b0::2020
-2001:8b0::2021
-##
-## AOL Broadband
-64.12.51.132
-149.174.221.8
-205.188.157.232
-205.188.146.145
-##
-## BE Unlimited
-87.194.0.51
-87.194.0.52
-87.194.0.66
-87.194.0.67
-##
-## BT Broadband
-62.6.40.178
-62.6.40.162
-194.72.9.38
-194.72.9.34
-194.72.0.98
-194.72.0.114
-194.74.65.68
-194.74.65.69
-##
-## Bulldog Broadband North
-212.158.248.5
-212.158.248.6
-##
-## Bulldog Broadband South
-83.146.21.5
-83.146.21.6
-##
-## Bytel
-80.76.204.35
-80.76.200.69
-##
-## Clara.net
-195.8.69.7
-195.8.69.12
-##
-## Datanet
-80.68.34.6
-77.241.177.2
-80.68.34.8
-##
-## Demon Internet
-158.152.1.58
-158.152.1.43
-##
-## Eclipse Internet
-212.104.130.9
-212.104.130.65
-##
-## Entanet
-195.74.102.146
-195.74.102.147
-##
-## Exa Networks
-82.219.4.24
-82.219.4.25
-##
-## Fast
-78.143.192.10
-78.143.192.20
-##
-## Freedom 2 Surf
-194.106.56.6
-194.106.33.42
-##
-## IDNet
-212.69.36.3
-212.69.36.2
-212.69.40.2
-##
-## Karoo
-212.50.160.100
-213.249.130.100
-##
-## Madasafish
-80.189.94.2
-80.189.92.2
-##
-## Merula
-217.146.97.10
-217.146.105.2
-##
-## Metronet
-213.162.97.65
-213.162.97.66
-##
-## Namesco
-195.7.224.57
-195.7.224.143
-##
-## NewNet
-212.87.64.10
-212.87.64.11
-##
-## Nildram
-213.208.106.212
-213.208.106.213
-##
-## O2
-87.194.0.51
-87.194.0.52
-87.194.0.66
-87.194.0.67
-##
-## Onetel
-212.67.96.129
-212.67.96.130
-##
-## Onyx
-194.176.65.5
-195.97.231.31
-##
-## Oosha
-213.190.161.254
-213.190.161.250
-213.190.160.9
-##
-## Orange
-195.92.195.94
-195.92.195.95
-##
-## Pipex
-62.241.160.200
-158.43.240.4
-212.74.112.66
-212.74.112.67
-##
-## PlusNet
-212.159.13.49
-212.159.13.50
-212.159.6.9
-212.159.6.10
-##
-## Powernet
-195.60.0.1
-195.60.0.5
-##
-## Prodigy
-198.83.19.241
-198.83.19.244
-207.115.59.241
-207.115.59.244
-##
-## SAQ
-195.2.130.209
-195.2.156.67
-##
-## Scotnet
-217.16.223.30
-217.16.223.31
-##
-## Sky Broadband
-87.86.189.16
-87.86.189.17
-195.40.1.36
-##
-## Skymarket
-212.84.173.66
-212.84.173.82
-##
-## Supanet
-213.40.66.126
-213.40.130.126
-##
-## TalkTalk
-62.24.199.13
-62.24.199.23
-62.24.128.18
-62.24.128.17
-##
-## Tesco
-194.168.4.100
-194.168.8.100
-##
-## Timewarp
-217.149.108.10
-217.149.108.11
-##
-## Timico
-195.54.225.10
-195.54.226.10
-##
-## Tiscali
-212.74.112.66
-212.74.112.67
-80.255.252.50
-80.255.252.58
-##
-## Topletter
-77.95.114.100
-77.95.112.1
-##
-## UK Online
-212.135.1.36
-195.40.1.36
-##
-## Utility Warehouse
-62.24.128.17
-62.24.128.18
-##
-## UTV Internet
-194.46.192.141
-194.46.192.142
-##
-## Virgin Media
-194.168.4.100
-194.168.8.100
-##
-## VISPA
-62.24.228.9
-62.24.228.10
-##
-## Zen Internet
-212.23.3.100
-212.23.6.100
-##
-####################################
-## NEW ZEALAND
-####################################
-##
-## Xtra
-202.27.158.40
-202.27.156.72
-##
-####################################
-## AUSTRALIA
-####################################
-##
-## AANet, Victoria
-203.24.100.125
-203.123.94.40
-##
-## AANet, South Australia
-203.24.100.125
-203.123.69.15
-##
-## AANet, Western Australia
-203.24.100.125
-202.76.136.40
-##
-## AANet, Queensland
-203.24.100.125
-202.76.170.40
-##
-## AANet, New South Wales
-203.24.100.125
-203.123.69.15
-##
-## AAPT, New South Wales
-192.189.54.33
-203.8.183.1
-##
-## AAPT, Victoria
-192.189.54.17
-203.8.183.1
-##
-## AAPT, Queensland
-192.189.54.33
-203.8.183.1
-##
-## AAPT, Tasmania
-192.189.54.17
-203.8.183.1
-##
-## AAPT, Australian Capital Territory
-192.189.54.33
-203.8.183.1
-##
-## AAPT, South Australia
-192.189.54.17
-203.8.183.1
-##
-## AAPT, Northern Territory
-192.189.54.17
-203.8.183.1
-##
-## AAPT, Western Australia
-192.189.54.17
-203.8.183.1
-##
-## Adam
-122.49.191.252
-122.49.191.253
-##
-## Amnet
-203.161.127.1
-203.153.224.42
-##
-## Comcen
-203.23.236.66
-203.23.236.69
-##
-## Dodo
-203.220.32.121
-203.220.32.122
-203.220.32.123
-##
-## Exetel
-220.233.0.4
-220.233.0.3
-##
-## iiNet
-203.0.178.191
-203.0.178.191
-##
-## Internode
-192.231.203.132
-192.231.203.3
-2001:44b8:1::1
-2001:44b8:2::2
-##
-## iPrimus, New South Wales
-203.134.64.66
-203.134.65.66
-##
-## iPrimus, Victoria
-203.134.24.70
-203.134.26.70
-##
-## iPrimus, Queensland
-203.134.12.90
-203.134.102.90
-##
-## iPrimus, Western Australia
-203.134.17.90
-211.26.25.90
-##
-## Netspace
-210.15.254.240
-210.15.254.241
-##
-## Optus
-211.29.132.12
-198.142.0.51
-##
-## People Telecom, New South Wales
-202.154.123.97
-218.214.227.3
-##
-## People Telecom, Northern Territory
-202.154.92.5
-218.214.228.97
-##
-## People Telecom, Queensland
-218.214.227.3
-202.154.123.97
-##
-## People Telecom, South Australia
-218.214.228.97
-218.214.17.1
-##
-## People Telecom, Victoria
-218.214.17.1
-218.214.228.97
-##
-## People Telecom, Western Australia
-202.154.92.5
-218.214.228.97
-##
-## Spin Internet
-203.23.236.66
-203.23.236.69
-##
-## Telstra BigPond, New South Wales
-61.9.194.49
-61.9.195.193
-##
-## Telstra BigPond, Victoria
-61.9.133.193
-61.9.134.49
-##
-## Telstra BigPond, Queensland
-61.9.211.33
-61.9.211.1
-##
-## Telstra BigPond, Tasmania
-61.9.188.33
-61.9.134.49
-##
-## Telstra BigPond, Australian Capital Territory
-61.9.207.1
-61.9.195.193
-##
-## Telstra BigPond, South Australia
-61.9.226.33
-61.9.194.49
-##
-## Telstra BigPond, Northern Territory
-61.9.226.33
-61.9.194.49
-##
-## Telstra BigPond, Western Australia
-61.9.242.33
-61.9.226.33
-##
-## TPG
-203.12.160.35
-203.12.160.36
-203.12.160.37
-##
-## Westnet
-203.21.20.20
-203.10.1.9
-########################################
diff --git a/inputs/short_hostname_list.txt b/inputs/short_hostname_list.txt
deleted file mode 100644
index f13c702..0000000
--- a/inputs/short_hostname_list.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-torproject.org
-google.com
-ooni.nu
-torrentz.eu
-anarchyplanet.org
-riseup.net
-indymedia.org
diff --git a/inputs/tld-list-cc.txt b/inputs/tld-list-cc.txt
deleted file mode 100644
index 57e0cc8..0000000
--- a/inputs/tld-list-cc.txt
+++ /dev/null
@@ -1,511 +0,0 @@
-.ac = Ascension Island
-
-.ad = Andorra
-
-.ae = United Arab Emirates
-
-.af = Afghanistan
-
-.ag = Antigua and Barbuda
-
-.ai = Anguilla
-
-.al = Albania
-
-.am = Armenia
-
-.an = Netherlands Antilles
-
-.ao = Angola
-
-.aq = Antarctica - no registrar
-
-.ar = Argentina
-
-.as = American Samoa
-
-.at = Austria
-
-.au = Australia
-
-.aw = Aruba - no registrar
-
-.ax = Aland Islands
-
-.az = Azerbaijan - no registrar
-
-.ba = Bosnia and Herzegovina
-
-.bb = Barbados
-
-.bd = Bangladesh - no registrar
-
-.be = Belgium
-
-.bf = Burkina Faso - no registrar
-
-.bg = Bulgaria
-
-.bh = Bahrain
-
-.bi = Burundi
-
-.bj = Benin ... (little info) DETAILS
-
-.bm = Bermuda
-
-.bn = Brunei Darussalam
-
-.bo = Bolivia
-
-.br = Brazil
-
-.bs = Bahamas
-
-.bt = Bhutan
-
-.bv = Bouvet Island - not in use
-
-.bw = Botswana - no registrar
-
-.by = Belarus
-
-.bz = Belize
-
-.ca = Canada
-
-.cc = Cocos (Keeling) Islands
-
-.cd = The Democratic Republic of the Congo
-
-.cf = Central African Republic - no registrar
-
-.cg = Republic of Congo
-
-.ch = Switzerland
-
-.ci = Cote d'Ivoire
-
-.ck = Cook Islands
-
-.cl = Chile
-
-.cm = Cameroon - no registrar - wildcarded
-
-.cn = China
-
-.co = Colombia
-
-.cr = Costa Rica
-
-.cs = (former) Serbia and Montenegro - no registrar - see: .me
-(.cs was also formerly the ISO_3166-1 code for Czechoslovakia, now .cs is closed.)
-
-.cu = Cuba - no registrar
-
-.cv = Cape Verde - no registrar
-
-.cx = Christmas Island
-
-.cy = Cyprus
-
-.cz = Czech Republic
-
-.dd = East Germany (obsolete)
-
-.de = Germany
-
-.dj = Djibouti - no information
-
-.dk = Denmark
-
-.dm = Dominica
-
-.do = Dominican Republic
-
-.dz = Algeria - no registrar
-
-.ec = Ecuador
-
-.ee = Estonia
-
-.eg = Egypt - DETAILS
-
-.eh = Western Sahara - no registrar
-
-.er = Eritrea - no registrar
-
-.es = Spain
-
-.et = Ethiopia
-
-.eu = European Union - DETAILS
-
-.fi = Finland
-
-.fj = Fiji
-
-.fk = Falkland Islands (Malvinas)
-
-.fm = Micronesia, Federal State of
-
-.fo = Faroe Islands
-
-.fr = France
-
-.ga = Gabon - no registrar
-
-.gb = Great Britain (United Kingdom) - reserved, see .uk
-
-.gd = Grenada
-
-.ge = Georgia
-
-.gf = French Guiana
-
-.gg = Guernsey
-
-.gh = Ghana
-
-.gi = Gibraltar
-
-.gl = Greenland
-
-.gm = Gambia
-
-.gn = Guinea
-
-.gp = Guadeloupe - no information
-
-.gq = Equatorial Guinea - no information
-
-.gr = Greece
-
-.gs = South Georgia and the
-South Sandwich Islands
-
-.gt = Guatemala
-
-.gu = Guam
-
-.gw = Guinea-Bissau - no registrar
-
-.gy = Guyana - no registrar
-
-.hk = Hong Kong
-
-.hm = Heard and McDonald Islands
-
-.hn = Honduras
-
-.hr = Croatia/Hrvatska
-
-.ht = Haiti - no registrar
-
-.hu = Hungary
-
-.id = Indonesia - no information
-
-.ie = Ireland
-
-.il = Israel
-
-.im = Isle of Man
-
-.in = India
-
-.io = British Indian Ocean Territory
-
-.iq = Iraq - no registrar
-
-.ir = Islamic Republic of Iran
-
-.is = Iceland
-
-.it = Italy
-
-.je = Jersey
-
-.jm = Jamaica - no registrar
-
-.jo = Jordan
-
-.jp = Japan
-
-.ke = Kenya
-
-.kg = Kyrgyzstan - no registrar
-
-.kh = Cambodia
-
-.ki = Kiribati
-
-.km = Comoros
-
-.kn = Saint Kitts and Nevis - no registrar
-
-.kp = Democratic People's Republic of Korea
-(North) - no registrar
-
-.kr = Republic of Korea (South)
-
-.kw = Kuwait - no registrar
-
-.ky = Cayman Islands
-
-.kz = Kazakhstan
-
-.la = Lao People's Democratic Republic (Laos)
-... DETAILS
-
-.lb = Lebanon
-
-.lc = Saint Lucia
-
-.li = Liechtenstein
-
-.lk = Sri Lanka
-
-.lr = Liberia
-
-.ls = Lesotho - no registrar
-
-.lt = Lithuania
-
-.lu = Luxembourg
-
-.lv = Latvia
-
-.ly = Libyan Arab Jamahiriya (Libya)
-
-.ma = Morocco
-
-.mc = Monaco
-
-.md = Moldova
-
-.me = Montenegro
-
-.mg = Madagascar
-
-.mh = Marshall Islands
-
-.mk = Macedonia
-
-.ml = Mali - no information
-
-.mm = Myanmar (formerly Burma) - no registrar
-
-.mn = Mongolia
-
-.mo = Macau
-
-.mp = Northern Mariana Islands
-
-.mq = Martinique - no information
-
-.mr = Mauritania
-
-.ms = Montserrat
-
-.mt = Malta
-
-.mu = Mauritius
-
-.mv = Maldives - no registrar
-
-.mw = Malawi
-
-.mx = Mexico
-
-.my = Malaysia
-
-.mz = Mozambique - no registrar
-
-.na = Namibia
-
-.nc = New Caledonia
-
-.ne = Niger - no information
-
-.nf = Norfolk Island
-
-.ng = Nigeria
-
-.ni = Nicaragua
-
-.nl = Netherlands
-
-.no = Norway
-
-.np = Nepal
-
-.nr = Nauru
-
-.nu = Niue
-
-.nz = New Zealand
-
-.om = Oman - Omantel.net.om not functioning
-
-.pa = Panama
-
-.pe = Peru
-
-.pf = French Polynesia - no registrar
-
-.pg = Papua New Guinea - no registrar
-
-.ph = Philippines
-
-.pk = Pakistan
-
-.pl = Poland
-
-.pm = Saint Pierre and Miquelon - not available
-
-.pn = Pitcairn Island
-
-.pr = Puerto Rico
-
-.ps = Palestinian Territories
-
-.pt = Portugal
-
-.pw = Palau
-
-.py = Paraguay
-
-.qa = Qatar
-
-.re = Reunion Island
-
-.ro = Romania
-
-.rs = Serbia - no registrar
-
-.ru = Russian Federation
-
-.rw = Rwanda
-
-.sa = Saudi Arabia
-
-.sb = Solomon Islands
-
-.sc = Seychelles
-
-.sd = Sudan
-
-.se = Sweden
-
-.sg = Singapore
-
-.sh = Saint Helena
-
-.si = Slovenia
-
-.sj = Svalbard and Jan Mayen Islands - not in use
-
-.sk = Slovak Republic
-
-.sl = Sierra Leone
-
-.sm = San Marino
-
-.sn = Senegal - no registrar
-
-.so = Somalia - no registrar
-
-.sr = Suriname
-
-.st = Sao Tome and Principe
-
-.su = Soviet Union
-
-.sv = El Salvador
-
-.sy = Syrian Arab Republic
-
-.sz = Swaziland
-
-.tc = Turks and Caicos Islands - no registrar
-
-.td = Chad - no registrar
-
-.tf = French Southern Territories - no registrar
-
-.tg = Togo
-
-.th = Thailand
-
-.tj = Tajikistan
-
-.tk = Tokelau
-
-.tl = Timor-Leste
-
-.tm = Turkmenistan
-
-.tn = Tunisia
-
-.to = Tonga
-
-.tp = East Timor - Closed. See: Timor-Leste
-
-.tr = Turkey
-
-.tt = Trinidad and Tobago
-
-.tv = Tuvalu
-
-.tw = Taiwan
-
-.tz = Tanzania
-
-.ua = Ukraine
-
-.ug = Uganda
-
-.uk = United Kingdom
-
-.um = United States Minor Outlying Islands
-- Withdrawn, no domains exist.
-
-.us = United States (USA)
-
-.uy = Uruguay
-
-.uz = Uzbekistan
-
-.va = Holy See (Vatican City State)- no registrar
-
-.vc = Saint Vincent and the Grenadines
-
-.ve = Venezuela
-
-.vg = British Virgin Islands
-
-.vi = U.S. Virgin Islands
-
-.vn = Vietnam
-
-.vu = Vanuatu
-
-.wf = Wallis and Futuna Islands - no registrar
-
-.ws = Western Samoa
-
-.ye = Yemen - no registrar
-
-.yt = Mayotte - no registrar
-
-.yu = Yugoslavia Withdrawn in favor of .me and .rs
-
-.za = South Africa
-
-.zm = Zambia - no registrar
-
-.zr = Zaire - Obsolete
-now: The Democratic Republic of the Congo (.cd)
-
-.zw = Zimbabwe - no registrar
diff --git a/inputs/tld-list-mozilla.txt b/inputs/tld-list-mozilla.txt
deleted file mode 100644
index 7902eee..0000000
--- a/inputs/tld-list-mozilla.txt
+++ /dev/null
@@ -1,5 +0,0 @@
---2012-05-19 13:07:53--  https://mxr.mozilla.org/mozilla-central/source/netwerk/dns/effective_tld_names.dat?raw=1
-Resolving mxr.mozilla.org (mxr.mozilla.org)... 63.245.215.42
-Connecting to mxr.mozilla.org (mxr.mozilla.org)|63.245.215.42|:443... connected.
-ERROR: The certificate of `mxr.mozilla.org' is not trusted.
-ERROR: The certificate of `mxr.mozilla.org' hasn't got a known issuer.
diff --git a/inputs/top-1m.txt.bak2 b/inputs/top-1m.txt.bak2
deleted file mode 100644
index 293e661..0000000
--- a/inputs/top-1m.txt.bak2
+++ /dev/null
@@ -1,11 +0,0 @@
-1,torproject.org
-2,google.com
-3,facebook.com
-4,youtube.com
-5,yahoo.com
-6,baidu.com
-7,wikipedia.org
-8,live.com
-9,blogspot.com
-10,twitter.com
-11,qq.com

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