Update the public suffix list (and its test)

2 files changed, 770 insertions, 152 deletions

diff --git a/data/effective_tld_names.dat b/data/effective_tld_names.dat
index 1738ab3e..95a555aa 100644
--- a/data/effective_tld_names.dat
+++ b/data/effective_tld_names.dat
@@ -175,17 +175,16 @@ it.ao
 // aq : http://en.wikipedia.org/wiki/.aq
 aq
 
-// ar : http://en.wikipedia.org/wiki/.ar
-*.ar
-!congresodelalengua3.ar
-!educ.ar
-!gobiernoelectronico.ar
-!mecon.ar
-!nacion.ar
-!nic.ar
-!promocion.ar
-!retina.ar
-!uba.ar
+// ar : https://nic.ar/normativa-vigente.xhtml
+ar
+com.ar
+edu.ar
+gob.ar
+int.ar
+mil.ar
+net.ar
+org.ar
+tur.ar
 
 // arpa : http://en.wikipedia.org/wiki/.arpa
 // Confirmed by registry <iana-questions@icann.org> 2008-06-18
@@ -219,9 +218,9 @@ net.au
 org.au
 edu.au
 gov.au
-csiro.au
 asn.au
 id.au
+csiro.au
 // Historic 2LDs (closed to new registration, but sites still exist)
 info.au
 conf.au
@@ -245,9 +244,8 @@ tas.edu.au
 vic.edu.au
 wa.edu.au
 act.gov.au
-// Removed at request of Shae.Donelan@services.nsw.gov.au, 2010-03-04
-// nsw.gov.au
-nt.gov.au
+// nsw.gov.au  Bug 547985 - Removed at request of <Shae.Donelan@services.nsw.gov.au>
+// nt.gov.au  Bug 940478 - Removed at request of Greg Connors <Greg.Connors@nt.gov.au>
 qld.gov.au
 sa.gov.au
 tas.gov.au
@@ -350,7 +348,7 @@ z.bg
 6.bg
 7.bg
 8.bg
-9.bg	 	 	
+9.bg
 
 // bh : http://en.wikipedia.org/wiki/.bh
 bh
@@ -402,7 +400,7 @@ mil.bo
 tv.bo
 
 // br : http://registro.br/dominio/dpn.html
-// Updated by registry <fneves@registro.br> 2011-03-01
+// Submitted by registry <fneves@registro.br> 2011-03-01
 br
 adm.br
 adv.br
@@ -415,13 +413,13 @@ b.br
 bio.br
 blog.br
 bmd.br
-can.br
 cim.br
 cng.br
 cnt.br
 com.br
 coop.br
 ecn.br
+eco.br
 edu.br
 emp.br
 eng.br
@@ -442,6 +440,7 @@ ind.br
 inf.br
 jor.br
 jus.br
+leg.br
 lel.br
 mat.br
 med.br
@@ -691,6 +690,14 @@ inf.cu
 // cv : http://en.wikipedia.org/wiki/.cv
 cv
 
+// cw : http://www.una.cw/cw_registry/
+// Confirmed by registry <registry@una.net> 2013-03-26
+cw
+com.cw
+edu.cw
+net.cw
+org.cw
+
 // cx : http://en.wikipedia.org/wiki/.cx
 // list of other 2nd level tlds ?
 cx
@@ -779,7 +786,7 @@ org.ee
 fie.ee
 
 // eg : http://en.wikipedia.org/wiki/.eg
-eg  
+eg
 com.eg
 edu.eg
 eun.eg
@@ -878,13 +885,12 @@ pvt.ge
 // gf : http://en.wikipedia.org/wiki/.gf
 gf
 
-// gg : http://www.channelisles.net/applic/avextn.shtml
+// gg : http://www.channelisles.net/register-domains/
+// Confirmed by registry <nigel@channelisles.net> 2013-11-28
 gg
 co.gg
-org.gg
 net.gg
-sch.gg
-gov.gg
+org.gg
 
 // gh : http://en.wikipedia.org/wiki/.gh
 // see also: http://www.nic.gh/reg_now.php
@@ -949,9 +955,15 @@ gov.gr
 // gs : http://en.wikipedia.org/wiki/.gs
 gs
 
-// gt : http://www.gt/politicas.html
-*.gt
-!www.gt
+// gt : http://www.gt/politicas_de_registro.html
+gt
+com.gt
+edu.gt
+gob.gt
+ind.gt
+mil.gt
+net.gt
+org.gt
 
 // gu : http://gadao.gov.gu/registration.txt
 *.gu
@@ -989,7 +1001,7 @@ org.hk
 网絡.hk
 组织.hk
 組織.hk
-組织.hk 
+組织.hk
 
 // hm : http://en.wikipedia.org/wiki/.hm
 hm
@@ -1065,13 +1077,14 @@ tozsde.hu
 utazas.hu
 video.hu
 
-// id : http://en.wikipedia.org/wiki/.id
-// see also: https://register.pandi.or.id/
+// id : https://register.pandi.or.id/
 id
 ac.id
+biz.id
 co.id
 go.id
 mil.id
+my.id
 net.id
 or.id
 sch.id
@@ -1084,16 +1097,18 @@ gov.ie
 // il : http://en.wikipedia.org/wiki/.il
 *.il
 
-// im : https://www.nic.im/pdfs/imfaqs.pdf
+// im : https://www.nic.im/
+// Submitted by registry <info@nic.im> 2013-11-15
 im
+ac.im
 co.im
+com.im
 ltd.co.im
-plc.co.im
 net.im
-gov.im
 org.im
-nic.im
-ac.im
+plc.co.im
+tt.im
+tv.im
 
 // in : http://en.wikipedia.org/wiki/.in
 // see also: http://www.inregistry.in/policies/
@@ -1165,9 +1180,9 @@ int.is
 it
 gov.it
 edu.it
-// list of reserved geo-names : 
+// list of reserved geo-names :
 // http://www.nic.it/documenti/regolamenti-e-linee-guida/regolamento-assegnazione-versione-6.0.pdf
-// (There is also a list of reserved geo-names corresponding to Italian 
+// (There is also a list of reserved geo-names corresponding to Italian
 // municipalities : http://www.nic.it/documenti/appendice-c.pdf , but it is
 // not included here.)
 agrigento.it
@@ -1446,13 +1461,12 @@ vi.it
 viterbo.it
 vt.it
 
-// je : http://www.channelisles.net/applic/avextn.shtml
+// je : http://www.channelisles.net/register-domains/
+// Confirmed by registry <nigel@channelisles.net> 2013-11-28
 je
 co.je
-org.je
 net.je
-sch.je
-gov.je
+org.je
 
 // jm : http://www.com.jm/register.html
 *.jm
@@ -1473,7 +1487,7 @@ jobs
 
 // jp : http://en.wikipedia.org/wiki/.jp
 // http://jprs.co.jp/en/jpdomain.html
-// Updated by registry <info@jprs.jp> 2012-05-28
+// Submitted by registry <info@jprs.jp> 2012-05-28
 jp
 // jp organizational type names
 ac.jp
@@ -3547,8 +3561,13 @@ gov.mr
 // ms : http://en.wikipedia.org/wiki/.ms
 ms
 
-// mt : https://www.nic.org.mt/dotmt/
-*.mt
+// mt : https://www.nic.org.mt/go/policy
+// Submitted by registry <help@nic.org.mt> 2013-11-19
+mt
+com.mt
+edu.mt
+net.mt
+org.mt
 
 // mu : http://en.wikipedia.org/wiki/.mu
 mu
@@ -4165,6 +4184,7 @@ name.my
 
 // mz : http://www.gobin.info/domainname/mz-template.doc
 *.mz
+!teledata.mz
 
 // na : http://www.na-nic.com.na/
 // http://www.info.na/domain/
@@ -4214,13 +4234,16 @@ other.nf
 store.nf
 
 // ng : http://psg.com/dns/ng/
-// Submitted by registry <randy@psg.com> 2008-06-17
-ac.ng
+ng
 com.ng
 edu.ng
-gov.ng
+name.ng
 net.ng
 org.ng
+sch.ng
+gov.ng
+mil.ng
+mobi.ng
 
 // ni : http://www.nic.ni/dominios.htm
 *.ni
@@ -4236,7 +4259,7 @@ bv.nl
 // no : http://www.norid.no/regelverk/index.en.html
 // The Norwegian registry has declined to notify us of updates. The web pages
 // referenced below are the official source of the data. There is also an
-// announce mailing list: 
+// announce mailing list:
 // https://postlister.uninett.no/sympa/info/norid-diskusjon
 no
 // Norid generic domains : http://www.norid.no/regelverk/vedlegg-c.en.html
@@ -5021,17 +5044,16 @@ nu
 *.nz
 
 // om : http://en.wikipedia.org/wiki/.om
-*.om
-!mediaphone.om
-!nawrastelecom.om
-!nawras.om
-!omanmobile.om
-!omanpost.om
-!omantel.om
-!rakpetroleum.om
-!siemens.om
-!songfest.om
-!statecouncil.om
+om
+co.om
+com.om
+edu.om
+gov.om
+med.om
+museum.om
+net.om
+org.om
+pro.om
 
 // org : http://en.wikipedia.org/wiki/.org
 org
@@ -5300,6 +5322,9 @@ org.pn
 edu.pn
 net.pn
 
+// post : http://en.wikipedia.org/wiki/.post
+post
+
 // pr : http://www.nic.pr/index.asp?f=1
 pr
 com.pr
@@ -5358,8 +5383,16 @@ ed.pw
 go.pw
 belau.pw
 
-// py : http://www.nic.py/faq_a.html#faq_b
-*.py
+// py : http://www.nic.py/pautas.html#seccion_9
+// Confirmed by registry 2012-10-03
+py
+com.py
+coop.py
+edu.py
+gov.py
+mil.py
+net.py
+org.py
 
 // qa : http://domains.qa/en/
 qa
@@ -5714,8 +5747,13 @@ store.st
 // su : http://en.wikipedia.org/wiki/.su
 su
 
-// sv : http://www.svnet.org.sv/svpolicy.html
-*.sv
+// sv : http://www.svnet.org.sv/niveldos.pdf
+sv
+com.sv
+edu.sv
+gob.sv
+org.sv
+red.sv
 
 // sx : http://en.wikipedia.org/wiki/.sx
 // Confirmed by registry <jcvignes@openregistry.com> 2012-05-31
@@ -5888,71 +5926,102 @@ club.tw
 組織.tw
 商業.tw
 
-// tz : http://en.wikipedia.org/wiki/.tz
-// Submitted by registry <randy@psg.com> 2008-06-17
-// Updated from http://www.tznic.or.tz/index.php/domains.html 2010-10-25
+// tz : http://www.tznic.or.tz/index.php/domains
+// Confirmed by registry <manager@tznic.or.tz> 2013-01-22
 ac.tz
 co.tz
 go.tz
+hotel.tz
+info.tz
+me.tz
 mil.tz
+mobi.tz
 ne.tz
 or.tz
 sc.tz
+tv.tz
 
-// ua : http://www.nic.net.ua/
+// ua : https://hostmaster.ua/policy/?ua
+// Submitted by registry <dk@cctld.ua> 2012-04-27
 ua
+// ua 2LD
 com.ua
 edu.ua
 gov.ua
 in.ua
 net.ua
 org.ua
-// ua geo-names
+// ua geographic names
+// https://hostmaster.ua/2ld/
 cherkassy.ua
+cherkasy.ua
 chernigov.ua
+chernihiv.ua
+chernivtsi.ua
 chernovtsy.ua
 ck.ua
 cn.ua
+cr.ua
 crimea.ua
 cv.ua
 dn.ua
 dnepropetrovsk.ua
+dnipropetrovsk.ua
+dominic.ua
 donetsk.ua
 dp.ua
 if.ua
 ivano-frankivsk.ua
 kh.ua
+kharkiv.ua
 kharkov.ua
 kherson.ua
 khmelnitskiy.ua
+khmelnytskyi.ua
 kiev.ua
 kirovograd.ua
 km.ua
 kr.ua
+krym.ua
 ks.ua
 kv.ua
+kyiv.ua
 lg.ua
+lt.ua
 lugansk.ua
 lutsk.ua
+lv.ua
 lviv.ua
 mk.ua
+mykolaiv.ua
 nikolaev.ua
 od.ua
+odesa.ua
 odessa.ua
 pl.ua
 poltava.ua
+rivne.ua
 rovno.ua
 rv.ua
+sb.ua
 sebastopol.ua
+sevastopol.ua
+sm.ua
 sumy.ua
 te.ua
 ternopil.ua
+uz.ua
 uzhgorod.ua
 vinnica.ua
+vinnytsia.ua
 vn.ua
+volyn.ua
+yalta.ua
 zaporizhzhe.ua
-zp.ua
+zaporizhzhia.ua
 zhitomir.ua
+zhytomyr.ua
+zp.ua
 zt.ua
 
 // Private registries in .ua
@@ -5971,20 +6040,19 @@ com.ug
 org.ug
 
 // uk : http://en.wikipedia.org/wiki/.uk
+// Submitted by registry <noc@nominet.org.uk> 2012-10-02
+// and tweaked by us pending further consultation.
 *.uk
 *.sch.uk
 !bl.uk
 !british-library.uk
-!icnet.uk
 !jet.uk
 !mod.uk
+!national-library-scotland.uk
 !nel.uk
-!nhs.uk
 !nic.uk
 !nls.uk
-!national-library-scotland.uk
 !parliament.uk
-!police.uk
 
 // us : http://en.wikipedia.org/wiki/.us
 us
@@ -6068,7 +6136,7 @@ k12.de.us
 k12.fl.us
 k12.ga.us
 k12.gu.us
-// k12.hi.us  Hawaii has a state-wide DOE login: bug 614565
+// k12.hi.us  Bug 614565 - Hawaii has a state-wide DOE login
 k12.ia.us
 k12.id.us
 k12.il.us
@@ -6099,7 +6167,7 @@ k12.pa.us
 k12.pr.us
 k12.ri.us
 k12.sc.us
-k12.sd.us
+// k12.sd.us  Bug 934131 - Removed at request of James Booze <James.Booze@k12.sd.us>
 k12.tn.us
 k12.tx.us
 k12.ut.us
@@ -6220,19 +6288,25 @@ lib.vt.us
 lib.va.us
 lib.wa.us
 lib.wi.us
-lib.wv.us
+// lib.wv.us  Bug 941670 - Removed at request of Larry W Arnold <arnold@wvlc.lib.wv.us>
 lib.wy.us
 
-// k12.ma.us contains school districts in Massachusetts. The 4LDs are 
+// k12.ma.us contains school districts in Massachusetts. The 4LDs are
 //  managed indepedently except for private (PVT), charter (CHTR) and
-//  parochial (PAROCH) schools.  Those are delegated dorectly to the 
+//  parochial (PAROCH) schools.  Those are delegated dorectly to the
 //  5LD operators.   <k12-ma-hostmaster _ at _ rsuc.gweep.net>
 pvt.k12.ma.us
 chtr.k12.ma.us
 paroch.k12.ma.us
 
-// uy : http://www.antel.com.uy/
-*.uy
+// uy : http://www.nic.org.uy/
+uy
+com.uy
+edu.uy
+gub.uy
+mil.uy
+net.uy
+org.uy
 
 // uz : http://www.reg.uz/
 uz
@@ -6254,8 +6328,19 @@ gov.vc
 mil.vc
 edu.vc
 
-// ve : http://registro.nic.ve/nicve/registro/index.html
-*.ve
+// ve : https://registro.nic.ve/
+// Confirmed by registry 2012-10-04
+ve
+co.ve
+com.ve
+e12.ve
+edu.ve
+gov.ve
+info.ve
+mil.ve
+net.ve
+org.ve
+web.ve
 
 // vg : http://en.wikipedia.org/wiki/.vg
 vg
@@ -6316,10 +6401,10 @@ yt
 // http://nic.ae/english/arabicdomain/rules.jsp
 امارات
 
-// xn--54b7fta0cc ("Bangla" Bangla) : BD  
+// xn--54b7fta0cc ("Bangla" Bangla) : BD
 বাংলা
 
-// xn--fiqs8s ("China" Chinese-Han-Simplified <.Zhonggou>) : CN 
+// xn--fiqs8s ("China" Chinese-Han-Simplified <.Zhonggou>) : CN
 // CNNIC
 // http://cnnic.cn/html/Dir/2005/10/11/3218.htm
 中国
@@ -6329,60 +6414,60 @@ yt
 // http://cnnic.cn/html/Dir/2005/10/11/3218.htm
 中國
 
-// xn--lgbbat1ad8j ("Algeria / Al Jazair" Arabic) : DZ  
+// xn--lgbbat1ad8j ("Algeria / Al Jazair" Arabic) : DZ
 الجزائر
 
 // xn--wgbh1c ("Egypt" Arabic .masr) : EG
 // http://www.dotmasr.eg/
 مصر
 
-// xn--node ("ge" Georgian (Mkhedruli)) : GE  
+// xn--node ("ge" Georgian (Mkhedruli)) : GE
 გე
 
 // xn--j6w193g ("Hong Kong" Chinese-Han) : HK
 // https://www2.hkirc.hk/register/rules.jsp
 香港
 
-// xn--h2brj9c ("Bharat" Devanagari) : IN  
+// xn--h2brj9c ("Bharat" Devanagari) : IN
 // India
 भारत
 
-// xn--mgbbh1a71e ("Bharat" Arabic) : IN  
+// xn--mgbbh1a71e ("Bharat" Arabic) : IN
 // India
 بھارت
 
-// xn--fpcrj9c3d ("Bharat" Telugu) : IN  
+// xn--fpcrj9c3d ("Bharat" Telugu) : IN
 // India
 భారత్
 
-// xn--gecrj9c ("Bharat" Gujarati) : IN  
+// xn--gecrj9c ("Bharat" Gujarati) : IN
 // India
 ભારત
 
-// xn--s9brj9c ("Bharat" Gurmukhi) : IN  
+// xn--s9brj9c ("Bharat" Gurmukhi) : IN
 // India
 ਭਾਰਤ
 
-// xn--45brj9c ("Bharat" Bengali) : IN  
+// xn--45brj9c ("Bharat" Bengali) : IN
 // India
 ভারত
 
-// xn--xkc2dl3a5ee0h ("India" Tamil) : IN  
+// xn--xkc2dl3a5ee0h ("India" Tamil) : IN
 // India
 இந்தியா
 
-// xn--mgba3a4f16a ("Iran" Persian) : IR  
+// xn--mgba3a4f16a ("Iran" Persian) : IR
 ایران
 
-// xn--mgba3a4fra ("Iran" Arabic) : IR  
+// xn--mgba3a4fra ("Iran" Arabic) : IR
 ايران
 
 // xn--mgbayh7gpa ("al-Ordon" Arabic) : JO
-// National Information Technology Center (NITC) 
+// National Information Technology Center (NITC)
 // Royal Scientific Society, Al-Jubeiha
 الاردن
 
-// xn--3e0b707e ("Republic of Korea" Hangul) : KR  
+// xn--3e0b707e ("Republic of Korea" Hangul) : KR
 한국
 
 // xn--fzc2c9e2c ("Lanka" Sinhalese-Sinhala) : LK
@@ -6393,10 +6478,10 @@ yt
 // http://nic.lk
 இலங்கை
 
-// xn--mgbc0a9azcg ("Morocco / al-Maghrib" Arabic) : MA  
+// xn--mgbc0a9azcg ("Morocco / al-Maghrib" Arabic) : MA
 المغرب
 
-// xn--mgb9awbf ("Oman" Arabic) : OM  
+// xn--mgb9awbf ("Oman" Arabic) : OM
 عمان
 
 // xn--ygbi2ammx ("Falasteen" Arabic) : PS
@@ -6404,7 +6489,7 @@ yt
 // http://www.pnina.ps
 فلسطين
 
-// xn--90a3ac ("srb" Cyrillic) : RS  
+// xn--90a3ac ("srb" Cyrillic) : RS
 срб
 
 // xn--p1ai ("rf" Russian-Cyrillic) : RU
@@ -6419,19 +6504,19 @@ yt
 // http://www.nic.net.sa/
 السعودية
 
-// xn--mgberp4a5d4a87g ("AlSaudiah" Arabic) variant : SA  
+// xn--mgberp4a5d4a87g ("AlSaudiah" Arabic) variant : SA
 السعودیة
 
-// xn--mgbqly7c0a67fbc ("AlSaudiah" Arabic) variant : SA  
+// xn--mgbqly7c0a67fbc ("AlSaudiah" Arabic) variant : SA
 السعودیۃ
 
-// xn--mgbqly7cvafr ("AlSaudiah" Arabic) variant : SA  
+// xn--mgbqly7cvafr ("AlSaudiah" Arabic) variant : SA
 السعوديه
 
-// xn--ogbpf8fl ("Syria" Arabic) : SY  
+// xn--ogbpf8fl ("Syria" Arabic) : SY
 سورية
 
-// xn--mgbtf8fl ("Syria" Arabic) variant : SY  
+// xn--mgbtf8fl ("Syria" Arabic) variant : SY
 سوريا
 
 // xn--yfro4i67o Singapore ("Singapore" Chinese-Han) : SG
@@ -6456,13 +6541,13 @@ yt
 // http://www.twnic.net/english/dn/dn_07a.htm
 台湾
 
-// xn--nnx388a ("Taiwan") variant : TW  
+// xn--nnx388a ("Taiwan") variant : TW
 臺灣
 
-// xn--j1amh ("ukr" Cyrillic) : UA  
+// xn--j1amh ("ukr" Cyrillic) : UA
 укр
 
-// xn--mgb2ddes ("AlYemen" Arabic) : YE  
+// xn--mgb2ddes ("AlYemen" Arabic) : YE
 اليمن
 
 // xxx : http://icmregistry.com
@@ -6480,30 +6565,464 @@ xxx
 // zw : http://en.wikipedia.org/wiki/.zw
 *.zw
 
-// ===END ICANN DOMAINS===
-// ===BEGIN PRIVATE DOMAINS===
 
-// info.at : http://www.info.at/
-biz.at
-info.at
+// xn--80asehdb : 2013-07-14 CORE Association
+онлайн
 
-// priv.at : http://www.nic.priv.at/
-// Submitted by registry <lendl@nic.at> 2008-06-09
-priv.at
+// xn--80aswg : 2013-07-14 CORE Association
+сайт
 
-// co.ca : http://registry.co.ca
-co.ca
+// xn--ngbc5azd : 2013-07-14 International Domain Registry Pty. Ltd.
+شبكة
+
+// xn--unup4y : 2013-07-14 Spring Fields, LLC
+游戏
+
+// xn--vhquv : 2013-08-28 Dash McCook, LLC
+企业
+
+// camera : 2013-08-28 Atomic Maple, LLC
+camera
+
+// clothing : 2013-08-28 Steel Lake, LLC
+clothing
+
+// lighting : 2013-08-28 John McCook, LLC
+lighting
+
+// singles : 2013-08-28 Fern Madison, LLC
+singles
+
+// ventures : 2013-08-28 Binky Lake, LLC
+ventures
+
+// voyage : 2013-08-28 Ruby House, LLC
+voyage
+
+// guru : 2013-08-28 Pioneer Cypress, LLC
+guru
+
+// holdings : 2013-08-28 John Madison, LLC
+holdings
+
+// equipment : 2013-08-28 Corn Station, LLC
+equipment
+
+// bike : 2013-08-28 Grand Hollow, LLC
+bike
+
+// estate : 2013-08-28 Trixy Park, LLC
+estate
+
+// tattoo : 2013-08-30 Uniregistry,Corp.
+tattoo
+
+// xn--3ds443g : 2013-09-09 TLD Registry Limited
+在线
+
+// xn--fiq228c5hs : 2013-09-09 TLD Registry Limited
+中文网
+
+// land : 2013-09-10 Pine Moon, LLC
+land
+
+// plumbing : 2013-09-10 Spring Tigers, LLC
+plumbing
+
+// contractors : 2013-09-10 Magic Woods, LLC
+contractors
+
+// sexy : 2013-09-11 Uniregistry,Corp.
+sexy
+
+// menu : 2013-09-11 Wedding TLD2, LLC
+menu
+
+// xn--rhqv96g : 2013-09-11 Stable Tone Limited
+世界
+
+// uno : 2013-09-11 Dot Latin, LLC
+uno
+
+// gallery : 2013-09-13 Sugar House, LLC
+gallery
+
+// technology : 2013-09-13 Auburn Falls
+technology
+
+// xn--3bst00m : 2013-09-13 Eagle Horizon Limited
+集团
+
+// reviews : 2013-09-13 Extra Cover, LLC
+reviews
+
+// guide : 2013-09-13 Snow Moon, LLC
+guide
+
+// xn--6qq986b3x1 : 2013-09-13 Tycoon Treasure Limited
+我爱你
+
+// graphics : 2013-09-13 Over Madison, LLC
+graphics
+
+// construction : 2013-09-13 Fox Dynamite, LLC
+construction
+
+// onl : 2013-09-16 I-Registry Ltd.
+onl
+
+// xn--q9jyb4c : 2013-09-17 Charleston Road Registry
+みんな
+
+// diamonds : 2013-09-23 John Edge, LLC
+diamonds
+
+// kiwi : 2013-09-23 Dot Kiwi Limited
+kiwi
+
+// enterprises : 2013-09-23 Snow Oaks LLC
+enterprises
+
+// today : 2013-09-23 Pearl Woods, LLC
+today
+
+// futbol : 2013-09-23 Atomic Falls, LLC
+futbol
+
+// photography : 2013-09-23 Sugar Glen, LLC
+photography
+
+// tips : 2013-09-23 Corn Willow, LLC
+tips
+
+// directory : 2013-09-23 Extra Madison, LLC
+directory
+
+// kitchen : 2013-09-23 Just Goodbye, LLC
+kitchen
+
+// xn--6frz82g : 2013-09-24 Afilias Limited
+移动
+
+// kim : 2013-09-24 Afilias Limited
+kim
+
+// xn--cg4bki : 2013-09-27 Samsung SDS Co., LTD
+삼성
+
+// monash : 2013-10-01 Monash University
+monash
+
+// wed : 2013-10-02 Atgron, Inc.
+wed
+
+// pink : 2013-10-02 Afilias Limited
+pink
+
+// ruhr : 2013-10-02 regiodot GmbH & Co. KG
+ruhr
+
+// buzz : 2013-10-03 DOTSTRATEGY CO.
+buzz
+
+// careers : 2013-10-03 Wild Corner, LLC
+careers
+
+// shoes : 2013-10-03 Binky Galley, LLC
+shoes
+
+// xn--4gbrim : 2013-10-07 Suhub Electronic Establishment
+موقع
+
+// career : 2013-10-09 dotCareer, LLC
+career
+
+// otsuka : 2013-10-11 Otsuka Holdings Co. Ltd.
+otsuka
+
+// xn--fiQ64b : 2013-10-14 CITIC Group Corporation
+中信
+
+// wed : 2013-10-02 Atgron, Inc. 
+wed
+
+// pink : 2013-10-02 Afilias Limited 
+pink
+
+// ruhr : 2013-10-02 regiodot GmbH & Co. KG 
+ruhr
+
+// buzz : 2013-10-03 DOTSTRATEGY CO. 
+buzz
+
+// careers : 2013-10-03 Wild Corner, LLC 
+careers
+
+// shoes : 2013-10-03 Binky Galley, LLC 
+shoes
+
+// xn--4gbrim : 2013-10-07 Suhub Electronic Establishment 
+موقع
+
+// career : 2013-10-09 dotCareer, LLC 
+career
+
+// otsuka : 2013-10-11 Otsuka Holdings Co. Ltd. 
+otsuka
+
+// xn--fiQ64b : 2013-10-14 CITIC Group Corporation 
+中信
+
+// gift : 2013-10-18 Uniregistry Corp. 
+gift
+
+// recipes : 2013-10-18 Grand Island, LLC 
+recipes
+
+// coffee : 2013-10-18 Trixy Cover, LLC 
+coffee
+
+// luxury : 2013-10-18 Luxury Partners, LLC 
+luxury
+
+// domains : 2013-10-18 Sugar Cross, LLC 
+domains
+
+// photos : 2013-10-18 Sea Corner, LLC 
+photos
+
+// limo : 2013-10-18 Hidden Frostbite, LLC 
+limo
+
+// viajes : 2013-10-18 Black Madison, LLC 
+viajes
+
+// wang : 2013-10-24 Zodiac Leo Limited 
+wang
+
+// democrat : 2013-10-24 United TLD Holdco Ltd. 
+democrat
+
+// mango : 2013-10-25 PUNTO FA S.L. 
+mango
+
+// cab : 2013-10-25 Half Sunset, LLC 
+cab
+
+// support : 2013-10-25 Grand Orchard, LLC 
+support
+
+// dance : 2013-10-25 United TLD Holdco Ltd. 
+dance
+
+// nagoya : 2013-10-25 GMO Registry, Inc. 
+nagoya
+
+// computer : 2013-10-25 Pine Mill, LLC 
+computer
+
+// wien : 2013-10-28 punkt.wien GmbH 
+wien
+
+// berlin : 2013-10-31 dotBERLIN GmbH & Co. KG 
+berlin
+
+// codes : 2013-10-31 Puff Willow, LLC 
+codes
+
+// email : 2013-10-31 Spring Madison, LLC 
+email
+
+// xn--mgbab2bd : 2013-10-31 CORE Association 
+بازار
+
+// repair : 2013-11-07 Lone Sunset, LLC 
+repair
+
+// holiday : 2013-11-07 Goose Woods, LLC 
+holiday
+
+// center : 2013-11-07 Tin Mill, LLC 
+center
+
+// systems : 2013-11-07 Dash Cypress, LLC 
+systems
+
+// wiki : 2013-11-07 Top Level Design, LLC 
+wiki
+
+// ceo : 2013-11-07 CEOTLD Pty Ltd 
+ceo
+
+// international : 2013-11-07 Wild Way, LLC 
+international
+
+// solar : 2013-11-07 Ruby Town, LLC 
+solar
+
+// company : 2013-11-07 Silver Avenue, LLC 
+company
+
+// education : 2013-11-07 Brice Way, LLC 
+education
+
+// training : 2013-11-07 Wild Willow, LLC 
+training
+
+// academy : 2013-11-07 Half Oaks, LLC 
+academy
+
+// marketing : 2013-11-07 Fern Pass, LLC 
+marketing
+
+// florist : 2013-11-08 Half Cypress, LLC 
+florist
+
+// solutions : 2013-11-07 Silver Cover, LLC 
+solutions
+
+// build : 2013-11-07 Plan Bee LLC 
+build
+
+// institute : 2013-11-07 Outer Maple, LLC 
+institute
+
+// builders : 2013-11-07 Atomic Madison, LLC 
+builders
+
+// red : 2013-11-07 Afilias Limited 
+red
+
+// blue : 2013-11-07 Afilias Limited 
+blue
+
+// ninja : 2013-11-07 United TLD Holdco Ltd. 
+ninja
+
+// business : 2013-11-07 Spring Cross, LLC 
+business
+
+// gal : 2013-11-07 Asociación puntoGAL 
+gal
+
+// social : 2013-11-07 United TLD Holdco Ltd. 
+social
+
+// house : 2013-11-07 Sugar Park, LLC 
+house
+
+// camp : 2013-11-07 Delta Dynamite, LLC 
+camp
+
+// immobilien : 2013-11-07 United TLD Holdco Ltd. 
+immobilien
+
+// moda : 2013-11-07 United TLD Holdco Ltd. 
+moda
+
+// glass : 2013-11-07 Black Cover, LLC 
+glass
+
+// management : 2013-11-07 John Goodbye, LLC 
+management
+
+// kaufen : 2013-11-07 United TLD Holdco Ltd. 
+kaufen
+
+// farm : 2013-11-07 Just Maple, LLC 
+farm
+
+// xn--55qw42g : 2013-11-08 China Organizational Name Administration Center 
+公益
+
+// xn--zfr164b : 2013-11-08 China Organizational Name Administration Center 
+政务
+
+// club : 2013-11-08 .CLUB DOMAINS, LLC 
+club
+
+// voting : 2013-11-13 Valuetainment Corp. 
+voting
+
+// TOKYO : 2013-11-13 GMO Registry, Inc. 
+TOKYO
+
+// moe : 2013-11-13 Interlink Co., Ltd. 
+moe
+
+
+// ===END ICANN DOMAINS===
+// ===BEGIN PRIVATE DOMAINS===
+
+// Amazon CloudFront : https://aws.amazon.com/cloudfront/
+// Submitted by Donavan Miller <donavanm@amazon.com> 2013-03-22
+cloudfront.net
+
+// Amazon Elastic Compute Cloud: https://aws.amazon.com/ec2/
+// Submitted by Osman Surkatty <osmans@amazon.com> 2013-04-02
+compute.amazonaws.com
+us-east-1.amazonaws.com
+compute-1.amazonaws.com
+z-1.compute-1.amazonaws.com
+z-2.compute-1.amazonaws.com
+ap-northeast-1.compute.amazonaws.com
+ap-southeast-1.compute.amazonaws.com
+ap-southeast-2.compute.amazonaws.com
+eu-west-1.compute.amazonaws.com
+sa-east-1.compute.amazonaws.com
+us-gov-west-1.compute.amazonaws.com
+us-west-1.compute.amazonaws.com
+us-west-2.compute.amazonaws.com
+
+// Amazon Elastic Beanstalk : https://aws.amazon.com/elasticbeanstalk/
+// Submitted by Adam Stein <astein@amazon.com> 2013-04-02
+elasticbeanstalk.com
+
+// Amazon Elastic Load Balancing : https://aws.amazon.com/elasticloadbalancing/
+// Submitted by Scott Vidmar <svidmar@amazon.com> 2013-03-27
+elb.amazonaws.com
+
+// Amazon S3 : https://aws.amazon.com/s3/
+// Submitted by Courtney Eckhardt <coec@amazon.com> 2013-03-22
+s3.amazonaws.com
+s3-us-west-2.amazonaws.com
+s3-us-west-1.amazonaws.com
+s3-eu-west-1.amazonaws.com
+s3-ap-southeast-1.amazonaws.com
+s3-ap-southeast-2.amazonaws.com
+s3-ap-northeast-1.amazonaws.com
+s3-sa-east-1.amazonaws.com
+s3-us-gov-west-1.amazonaws.com
+s3-fips-us-gov-west-1.amazonaws.com
+s3-website-us-east-1.amazonaws.com
+s3-website-us-west-2.amazonaws.com
+s3-website-us-west-1.amazonaws.com
+s3-website-eu-west-1.amazonaws.com
+s3-website-ap-southeast-1.amazonaws.com
+s3-website-ap-southeast-2.amazonaws.com
+s3-website-ap-northeast-1.amazonaws.com
+s3-website-sa-east-1.amazonaws.com
+s3-website-us-gov-west-1.amazonaws.com
+
+// BetaInABox
+// Submitted by adrian@betainabox.com 2012-09-13
+betainabox.com
 
 // CentralNic : http://www.centralnic.com/names/domains
-// Confirmed by registry <gavin.brown@centralnic.com> 2008-06-09
+// Submitted by registry <gavin.brown@centralnic.com> 2012-09-27
+ae.org
 ar.com
 br.com
 cn.com
+com.de
 de.com
 eu.com
 gb.com
+gb.net
 gr.com
 hu.com
+hu.net
+jp.net
 jpn.com
 kr.com
 no.com
@@ -6511,44 +7030,36 @@ qc.com
 ru.com
 sa.com
 se.com
+se.net
 uk.com
+uk.net
 us.com
+us.org
 uy.com
 za.com
-gb.net
-jp.net
-se.net
-uk.net
-ae.org
-us.org
-com.de
-
-// Opera Software, A.S.A.
-// Requested by Yngve Pettersen <yngve@opera.com> 2009-11-26
-operaunite.com
-
-// Google, Inc.
-// Requested by Eduardo Vela <evn@google.com> 2010-09-06
-appspot.com
-
-// iki.fi : Submitted by Hannu Aronsson <haa@iki.fi> 2009-11-05
-iki.fi
 
 // c.la : http://www.c.la/
 c.la
 
-// ZaNiC : http://www.za.net/
-// Confirmed by registry <hostmaster@nic.za.net> 2009-10-03
-za.net
-za.org
+// cloudControl : https://www.cloudcontrol.com/
+// Submitted by Tobias Wilken <tw@cloudcontrol.com> 2013-07-23
+cloudcontrolled.com
+cloudcontrolapp.com
+
+// co.ca : http://registry.co.ca/
+co.ca
 
 // CoDNS B.V.
-// Added 2010-05-23.
 co.nl
 co.no
 
-// Mainseek Sp. z o.o. : http://www.co.pl/
-co.pl
+// Cupcake : https://cupcake.io/
+// Submitted by Jonathan Rudenberg <jonathan@cupcake.io> 2013-10-08
+cupcake.is
+
+// DreamHost : http://www.dreamhost.com/
+// Submitted by Andrew Farmer <andrew.farmer@dreamhost.com> 2012-10-02
+dreamhosters.com
 
 // DynDNS.com : http://www.dyndns.com/services/dns/dyndns/
 dyndns-at-home.com
@@ -6831,4 +7342,104 @@ webhop.org
 worse-than.tv
 writesthisblog.com
 
+// Fastly Inc. http://www.fastly.com/
+// Submitted by Vladimir Vuksan <vladimir@fastly.com> 2013-05-31
+a.ssl.fastly.net
+b.ssl.fastly.net
+global.ssl.fastly.net
+a.prod.fastly.net
+global.prod.fastly.net
+
+// GitHub, Inc.
+// Submitted by Ben Toews <btoews@github.com> 2013-04-18
+github.io
+
+// GlobeHosting, Inc.
+// Submitted by Zoltan Egresi <egresi@globehosting.com> 2013-07-12
+ro.com
+
+// Google, Inc.
+// Submitted by Eduardo Vela <evn@google.com> 2012-10-24
+appspot.com
+blogspot.be
+blogspot.bj
+blogspot.ca
+blogspot.cf
+blogspot.ch
+blogspot.co.at
+blogspot.co.il
+blogspot.co.nz
+blogspot.co.uk
+blogspot.com
+blogspot.com.ar
+blogspot.com.au
+blogspot.com.br
+blogspot.com.es
+blogspot.cv
+blogspot.cz
+blogspot.de
+blogspot.dk
+blogspot.fi
+blogspot.fr
+blogspot.gr
+blogspot.hk
+blogspot.hu
+blogspot.ie
+blogspot.in
+blogspot.it
+blogspot.jp
+blogspot.kr
+blogspot.mr
+blogspot.mx
+blogspot.nl
+blogspot.no
+blogspot.pt
+blogspot.re
+blogspot.ro
+blogspot.se
+blogspot.sg
+blogspot.sk
+blogspot.td
+blogspot.tw
+codespot.com
+googleapis.com
+googlecode.com
+
+// Heroku : https://www.heroku.com/
+// Submitted by Tom Maher <tmaher@heroku.com> 2013-05-02
+herokuapp.com
+herokussl.com
+
+// iki.fi
+// Submitted by Hannu Aronsson <haa@iki.fi> 2009-11-05
+iki.fi
+
+// info.at : http://www.info.at/
+biz.at
+info.at
+
+// Michau Enterprises Limited : http://www.co.pl/
+co.pl
+
+// NYC.mn : http://www.information.nyc.mn
+// Submitted by Matthew Brown <mattbrown@nyc.mn> 2013-03-11
+nyc.mn
+
+// Opera Software, A.S.A.
+// Submitted by Yngve Pettersen <yngve@opera.com> 2009-11-26
+operaunite.com
+
+// Red Hat, Inc. OpenShift : https://openshift.redhat.com/
+// Submitted by Tim Kramer <tkramer@rhcloud.com> 2012-10-24
+rhcloud.com
+
+// priv.at : http://www.nic.priv.at/
+// Submitted by registry <lendl@nic.at> 2008-06-09
+priv.at
+
+// ZaNiC : http://www.za.net/
+// Submitted by registry <hostmaster@nic.za.net> 2009-10-03
+za.net
+za.org
+
 // ===END PRIVATE DOMAINS===
diff --git a/tests/tld-test.c b/tests/tld-test.c
index d0c73a8e..2b6b5dd9 100644
--- a/tests/tld-test.c
+++ b/tests/tld-test.c
@@ -57,12 +57,12 @@ static struct {
   { "city.kyoto.jp", "city.kyoto.jp" },
   { "www.city.kyoto.jp", "city.kyoto.jp" },
   /* TLD with a wildcard rule and exceptions. */
-  { "om", NULL },
-  { "test.om", NULL },
-  { "b.test.om", "b.test.om" },
-  { "a.b.test.om", "b.test.om" },
-  { "songfest.om", "songfest.om" },
-  { "www.songfest.om", "songfest.om" },
+  { "ck", NULL },
+  { "test.ck", NULL },
+  { "b.test.ck", "b.test.ck" },
+  { "a.b.test.ck", "b.test.ck" },
+  { "www.ck", "www.ck" },
+  { "www.www.ck", "www.ck" },
   /* US K12. */
   { "us", NULL },
   { "test.us", "test.us" },
@@ -73,11 +73,18 @@ static struct {
   { "k12.ak.us", NULL },
   { "test.k12.ak.us", "test.k12.ak.us" },
   { "www.test.k12.ak.us", "test.k12.ak.us" },
+  /* IDN labels. */
+  { "食狮.com.cn", "食狮.com.cn" },
+  { "食狮.公司.cn", "食狮.公司.cn" },
+  { "www.食狮.公司.cn", "食狮.公司.cn" },
+  { "shishi.公司.cn", "shishi.公司.cn" },
+  { "公司.cn", NULL },
+  { "食狮.中国", "食狮.中国" },
+  { "www.食狮.中国", "食狮.中国" },
+  { "shishi.中国", "shishi.中国" },
+  { "中国", NULL },
   /* This is not in http://publicsuffix.org/list/test.txt but we want to check it anyway. */
   { "co.uk", NULL },
-  /* The original list does not include non-ASCII tests. Let's add a couple. */
-  { "公司.cn", NULL },
-  { "a.b.åfjord.no", "b.åfjord.no" }
 },
 /* Non Internet TLDs have NULL as expected result
  */