tor-commits June 2012

tor-commits@lists.torproject.org

17 participants
880 discussions

[vidalia/alpha] Enlarge countries' list and make CountryInfo.cpp,
by chiiph＠torproject.org 25 Jun '12

25 Jun '12

commit 78b41ae72374a8d386183217561ed50e64b17e6b Author: Boris Skegin <boris.skegin.de(a)gmail.com> Date: Fri Jun 22 15:31:25 2012 +0200 Enlarge countries' list and make CountryInfo.cpp, country-coordinates.csv and geoip consistent. --- changes/bug6130 | 3 + src/vidalia/network/CountryInfo.cpp | 285 +++++++++++-------- src/vidalia/res/country-coordinates.csv | 495 +++++++++++++++---------------- src/vidalia/res/flags/ad.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/ae.png | Bin 1048 -> 1093 bytes src/vidalia/res/flags/af.png | Bin 1063 -> 1170 bytes src/vidalia/res/flags/ag.png | Bin 0 -> 1195 bytes src/vidalia/res/flags/ai.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/al.png | Bin 1061 -> 1185 bytes src/vidalia/res/flags/am.png | Bin 1063 -> 1185 bytes src/vidalia/res/flags/an.png | Bin 1062 -> 1117 bytes src/vidalia/res/flags/ao.png | Bin 1062 -> 1125 bytes src/vidalia/res/flags/aq.png | Bin 0 -> 998 bytes src/vidalia/res/flags/ar.png | Bin 1064 -> 1132 bytes src/vidalia/res/flags/as.png | Bin 0 -> 1177 bytes src/vidalia/res/flags/at.png | Bin 1062 -> 1096 bytes src/vidalia/res/flags/au.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/aw.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/ax.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/az.png | Bin 1063 -> 1182 bytes src/vidalia/res/flags/ba.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/bb.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/bd.png | Bin 1061 -> 1185 bytes src/vidalia/res/flags/be.png | Bin 1060 -> 1170 bytes src/vidalia/res/flags/bf.png | Bin 1063 -> 1182 bytes src/vidalia/res/flags/bg.png | Bin 602 -> 1038 bytes src/vidalia/res/flags/bh.png | Bin 1052 -> 1153 bytes src/vidalia/res/flags/bi.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/bj.png | Bin 1063 -> 1185 bytes src/vidalia/res/flags/bl.png | Bin 0 -> 1083 bytes src/vidalia/res/flags/bm.png | Bin 1057 -> 1176 bytes src/vidalia/res/flags/bn.png | Bin 1064 -> 1189 bytes src/vidalia/res/flags/bo.png | Bin 1063 -> 1185 bytes src/vidalia/res/flags/br.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/bs.png | Bin 1063 -> 1179 bytes src/vidalia/res/flags/bt.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/bv.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/bw.png | Bin 1053 -> 1185 bytes src/vidalia/res/flags/by.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/bz.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/ca.png | Bin 1064 -> 1171 bytes src/vidalia/res/flags/cc.png | Bin 0 -> 1179 bytes src/vidalia/res/flags/cd.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/cf.png | Bin 1064 -> 1171 bytes src/vidalia/res/flags/cg.png | Bin 1061 -> 1185 bytes src/vidalia/res/flags/ch.png | Bin 1045 -> 1185 bytes src/vidalia/res/flags/ci.png | Bin 1061 -> 1083 bytes src/vidalia/res/flags/ck.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/cl.png | Bin 1046 -> 1039 bytes src/vidalia/res/flags/cm.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/cn.png | Bin 645 -> 1185 bytes src/vidalia/res/flags/co.png | Bin 1051 -> 1185 bytes src/vidalia/res/flags/cr.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/cu.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/cv.png | Bin 1062 -> 1185 bytes src/vidalia/res/flags/cx.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/cy.png | Bin 1062 -> 902 bytes src/vidalia/res/flags/cz.png | Bin 1063 -> 1040 bytes src/vidalia/res/flags/de.png | Bin 194 -> 1185 bytes src/vidalia/res/flags/dj.png | Bin 0 -> 1174 bytes src/vidalia/res/flags/dk.png | Bin 1058 -> 1185 bytes src/vidalia/res/flags/dm.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/do.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/dz.png | Bin 1058 -> 1042 bytes src/vidalia/res/flags/ec.png | Bin 1063 -> 1185 bytes src/vidalia/res/flags/ee.png | Bin 1062 -> 1189 bytes src/vidalia/res/flags/eg.png | Bin 1062 -> 1063 bytes src/vidalia/res/flags/eh.png | Bin 0 -> 1174 bytes src/vidalia/res/flags/er.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/es.png | Bin 342 -> 1185 bytes src/vidalia/res/flags/et.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/eu.png | Bin 146 -> 1185 bytes src/vidalia/res/flags/fi.png | Bin 344 -> 1028 bytes src/vidalia/res/flags/fj.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/fk.png | Bin 0 -> 1176 bytes src/vidalia/res/flags/fm.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/fo.png | Bin 1062 -> 1035 bytes src/vidalia/res/flags/fr.png | Bin 226 -> 1083 bytes src/vidalia/res/flags/ga.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/gb.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/gd.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/ge.png | Bin 649 -> 1141 bytes src/vidalia/res/flags/gf.png | Bin 0 -> 1179 bytes src/vidalia/res/flags/gg.png | Bin 0 -> 1021 bytes src/vidalia/res/flags/gh.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/gi.png | Bin 1060 -> 1024 bytes src/vidalia/res/flags/gl.png | Bin 1059 -> 1057 bytes src/vidalia/res/flags/gm.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/gn.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/gp.png | Bin 1051 -> 1173 bytes src/vidalia/res/flags/gq.png | Bin 0 -> 1165 bytes src/vidalia/res/flags/gr.png | Bin 1064 -> 1176 bytes src/vidalia/res/flags/gs.png | Bin 0 -> 1182 bytes src/vidalia/res/flags/gt.png | Bin 1064 -> 1150 bytes src/vidalia/res/flags/gu.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/gw.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/gy.png | Bin 1062 -> 1185 bytes src/vidalia/res/flags/hk.png | Bin 1062 -> 1185 bytes src/vidalia/res/flags/hm.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/hn.png | Bin 0 -> 1149 bytes src/vidalia/res/flags/hr.png | Bin 1062 -> 1149 bytes src/vidalia/res/flags/ht.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/hu.png | Bin 606 -> 1096 bytes src/vidalia/res/flags/id.png | Bin 1062 -> 1109 bytes src/vidalia/res/flags/ie.png | Bin 1063 -> 1102 bytes src/vidalia/res/flags/il.png | Bin 1063 -> 1065 bytes src/vidalia/res/flags/im.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/in.png | Bin 1064 -> 1156 bytes src/vidalia/res/flags/io.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/iq.png | Bin 1063 -> 1097 bytes src/vidalia/res/flags/ir.png | Bin 1064 -> 1132 bytes src/vidalia/res/flags/is.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/it.png | Bin 231 -> 1083 bytes src/vidalia/res/flags/je.png | Bin 0 -> 1106 bytes src/vidalia/res/flags/jm.png | Bin 1063 -> 1185 bytes src/vidalia/res/flags/jo.png | Bin 1063 -> 1158 bytes src/vidalia/res/flags/jp.png | Bin 669 -> 897 bytes src/vidalia/res/flags/ke.png | Bin 1060 -> 1182 bytes src/vidalia/res/flags/kg.png | Bin 1062 -> 1185 bytes src/vidalia/res/flags/kh.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/ki.png | Bin 1063 -> 1182 bytes src/vidalia/res/flags/km.png | Bin 0 -> 1180 bytes src/vidalia/res/flags/kn.png | Bin 0 -> 1179 bytes src/vidalia/res/flags/kp.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/kr.png | Bin 1061 -> 1058 bytes src/vidalia/res/flags/kw.png | Bin 1032 -> 1137 bytes src/vidalia/res/flags/ky.png | Bin 1062 -> 1182 bytes src/vidalia/res/flags/kz.png | Bin 1063 -> 1182 bytes src/vidalia/res/flags/la.png | Bin 0 -> 1189 bytes src/vidalia/res/flags/lb.png | Bin 1063 -> 1074 bytes src/vidalia/res/flags/lc.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/li.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/lk.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/lr.png | Bin 0 -> 1182 bytes src/vidalia/res/flags/ls.png | Bin 0 -> 1134 bytes src/vidalia/res/flags/lt.png | Bin 1062 -> 1185 bytes src/vidalia/res/flags/lu.png | Bin 1062 -> 1096 bytes src/vidalia/res/flags/lv.png | Bin 1053 -> 1185 bytes src/vidalia/res/flags/ly.png | Bin 644 -> 1185 bytes src/vidalia/res/flags/ma.png | Bin 104 -> 1185 bytes src/vidalia/res/flags/mc.png | Bin 1061 -> 1109 bytes src/vidalia/res/flags/md.png | Bin 1062 -> 1185 bytes src/vidalia/res/flags/me.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/mf.png | Bin 0 -> 1083 bytes src/vidalia/res/flags/mg.png | Bin 1062 -> 1113 bytes src/vidalia/res/flags/mh.png | Bin 0 -> 1198 bytes src/vidalia/res/flags/mk.png | Bin 294 -> 1185 bytes src/vidalia/res/flags/ml.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/mm.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/mn.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/mo.png | Bin 1062 -> 1182 bytes src/vidalia/res/flags/mp.png | Bin 1063 -> 1185 bytes src/vidalia/res/flags/mq.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/mr.png | Bin 0 -> 1182 bytes src/vidalia/res/flags/ms.png | Bin 1064 -> 1182 bytes src/vidalia/res/flags/mt.png | Bin 647 -> 1101 bytes src/vidalia/res/flags/mu.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/mv.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/mw.png | Bin 0 -> 1182 bytes src/vidalia/res/flags/mx.png | Bin 1063 -> 1171 bytes src/vidalia/res/flags/my.png | Bin 1064 -> 1182 bytes src/vidalia/res/flags/mz.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/na.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/nc.png | Bin 1062 -> 1083 bytes src/vidalia/res/flags/ne.png | Bin 0 -> 1132 bytes src/vidalia/res/flags/nf.png | Bin 1062 -> 1182 bytes src/vidalia/res/flags/ng.png | Bin 0 -> 1083 bytes src/vidalia/res/flags/ni.png | Bin 0 -> 1132 bytes src/vidalia/res/flags/nl.png | Bin 607 -> 1096 bytes src/vidalia/res/flags/no.png | Bin 1062 -> 1185 bytes src/vidalia/res/flags/np.png | Bin 104 -> 935 bytes src/vidalia/res/flags/nr.png | Bin 1059 -> 1185 bytes src/vidalia/res/flags/nu.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/nz.png | Bin 1063 -> 1185 bytes src/vidalia/res/flags/om.png | Bin 1062 -> 1109 bytes src/vidalia/res/flags/pa.png | Bin 1062 -> 1171 bytes src/vidalia/res/flags/pe.png | Bin 1064 -> 1083 bytes src/vidalia/res/flags/pf.png | Bin 1064 -> 1062 bytes src/vidalia/res/flags/pg.png | Bin 0 -> 1130 bytes src/vidalia/res/flags/ph.png | Bin 1064 -> 1195 bytes src/vidalia/res/flags/pk.png | Bin 1062 -> 1129 bytes src/vidalia/res/flags/pl.png | Bin 583 -> 1182 bytes src/vidalia/res/flags/pm.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/pn.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/pr.png | Bin 1064 -> 1176 bytes src/vidalia/res/flags/ps.png | Bin 0 -> 1129 bytes src/vidalia/res/flags/pt.png | Bin 355 -> 1182 bytes src/vidalia/res/flags/pw.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/py.png | Bin 1062 -> 1129 bytes src/vidalia/res/flags/qa.png | Bin 668 -> 1109 bytes src/vidalia/res/flags/re.png | Bin 0 -> 1083 bytes src/vidalia/res/flags/ro.png | Bin 1063 -> 1185 bytes src/vidalia/res/flags/rs.png | Bin 0 -> 1176 bytes src/vidalia/res/flags/ru.png | Bin 232 -> 1029 bytes src/vidalia/res/flags/rw.png | Bin 0 -> 1182 bytes src/vidalia/res/flags/sa.png | Bin 1063 -> 1185 bytes src/vidalia/res/flags/sb.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/sc.png | Bin 0 -> 1198 bytes src/vidalia/res/flags/sd.png | Bin 1062 -> 1087 bytes src/vidalia/res/flags/se.png | Bin 1062 -> 1185 bytes src/vidalia/res/flags/sg.png | Bin 1062 -> 1112 bytes src/vidalia/res/flags/sh.png | Bin 0 -> 1182 bytes src/vidalia/res/flags/si.png | Bin 1063 -> 1090 bytes src/vidalia/res/flags/sj.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/sk.png | Bin 1063 -> 1090 bytes src/vidalia/res/flags/sl.png | Bin 1063 -> 1093 bytes src/vidalia/res/flags/sm.png | Bin 946 -> 990 bytes src/vidalia/res/flags/sn.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/so.png | Bin 1054 -> 1185 bytes src/vidalia/res/flags/sr.png | Bin 0 -> 1182 bytes src/vidalia/res/flags/st.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/sv.png | Bin 0 -> 1129 bytes src/vidalia/res/flags/sy.png | Bin 104 -> 1096 bytes src/vidalia/res/flags/sz.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/tc.png | Bin 1061 -> 1182 bytes src/vidalia/res/flags/td.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/tf.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/tg.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/th.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/tj.png | Bin 0 -> 1154 bytes src/vidalia/res/flags/tk.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/tl.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/tm.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/tn.png | Bin 1062 -> 1185 bytes src/vidalia/res/flags/to.png | Bin 670 -> 1179 bytes src/vidalia/res/flags/tr.png | Bin 1050 -> 1185 bytes src/vidalia/res/flags/tt.png | Bin 1064 -> 1182 bytes src/vidalia/res/flags/tv.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/tw.png | Bin 654 -> 1179 bytes src/vidalia/res/flags/tz.png | Bin 1061 -> 1179 bytes src/vidalia/res/flags/ua.png | Bin 1062 -> 1185 bytes src/vidalia/res/flags/ug.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/um.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/us.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/uy.png | Bin 1064 -> 1182 bytes src/vidalia/res/flags/uz.png | Bin 0 -> 1096 bytes src/vidalia/res/flags/va.png | Bin 1063 -> 1130 bytes src/vidalia/res/flags/vc.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/ve.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/vg.png | Bin 1064 -> 1182 bytes src/vidalia/res/flags/vi.png | Bin 1064 -> 1168 bytes src/vidalia/res/flags/vn.png | Bin 1059 -> 1185 bytes src/vidalia/res/flags/vu.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/wf.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/ws.png | Bin 1048 -> 1185 bytes src/vidalia/res/flags/ye.png | Bin 1062 -> 1030 bytes src/vidalia/res/flags/yt.png | Bin 0 -> 1079 bytes src/vidalia/res/flags/za.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/zm.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/zw.png | Bin 269 -> 1185 bytes 250 files changed, 417 insertions(+), 366 deletions(-) diff --git a/changes/bug6130 b/changes/bug6130 new file mode 100644 index 0000000..bbc18c7 --- /dev/null +++ b/changes/bug6130 @@ -0,0 +1,3 @@ + Internal cleanups and improvements: + o Enlarge countries' list and make CountryInfo.cpp, + country-coordinates.csv and geoip consistent. diff --git a/src/vidalia/network/CountryInfo.cpp b/src/vidalia/network/CountryInfo.cpp index 3e0cfd9..8230597 100644 --- a/src/vidalia/network/CountryInfo.cpp +++ b/src/vidalia/network/CountryInfo.cpp @@ -35,203 +35,254 @@ CountryInfo::countryName(const QString &countryCode) { static QMap<QString,QString> db; if (db.isEmpty()) { - db.insert("af", QT_TR_NOOP("Afghanistan")); - db.insert("al", QT_TR_NOOP("Albania ")); - db.insert("dz", QT_TR_NOOP("Algeria ")); + db.insert("a1", QT_TR_NOOP("Anonymous Proxy")); + db.insert("a2", QT_TR_NOOP("Satellite Provider")); db.insert("ad", QT_TR_NOOP("Andorra")); + db.insert("ae", QT_TR_NOOP("United Arab Emirates")); + db.insert("af", QT_TR_NOOP("Afghanistan")); + db.insert("ag", QT_TR_NOOP("Antigua and Barbuda")); + db.insert("ai", QT_TR_NOOP("Anguilla")); + db.insert("al", QT_TR_NOOP("Albania")); + db.insert("am", QT_TR_NOOP("Armenia")); + db.insert("an", QT_TR_NOOP("Netherlands Antilles")); db.insert("ao", QT_TR_NOOP("Angola")); - db.insert("ag", QT_TR_NOOP("Antigua & Barbuda")); + db.insert("ap", QT_TR_NOOP("Asia/Pacific Region")); + db.insert("aq", QT_TR_NOOP("Antarctica")); db.insert("ar", QT_TR_NOOP("Argentina")); - db.insert("am", QT_TR_NOOP("Armenia")); + db.insert("as", QT_TR_NOOP("American Samoa")); + db.insert("at", QT_TR_NOOP("Austria")); db.insert("au", QT_TR_NOOP("Australia")); - db.insert("at", QT_TR_NOOP("Austria ")); + db.insert("aw", QT_TR_NOOP("Aruba")); + db.insert("ax", QT_TR_NOOP("Aland Islands")); db.insert("az", QT_TR_NOOP("Azerbaijan")); - db.insert("bs", QT_TR_NOOP("Bahamas")); - db.insert("bh", QT_TR_NOOP("Bahrain ")); - db.insert("bd", QT_TR_NOOP("Bangladesh")); + db.insert("ba", QT_TR_NOOP("Bosnia and Herzegovina")); db.insert("bb", QT_TR_NOOP("Barbados")); - db.insert("by", QT_TR_NOOP("Belarus")); + db.insert("bd", QT_TR_NOOP("Bangladesh")); db.insert("be", QT_TR_NOOP("Belgium")); - db.insert("bz", QT_TR_NOOP("Belize")); - db.insert("bj", QT_TR_NOOP("Benin ")); - db.insert("bt", QT_TR_NOOP("Bhutan")); - db.insert("bo", QT_TR_NOOP("Bolivia")); - db.insert("ba", QT_TR_NOOP("Bosnia & Herzegovina")); - db.insert("bw", QT_TR_NOOP("Botswana")); - db.insert("br", QT_TR_NOOP("Brazil")); - db.insert("bn", QT_TR_NOOP("Brunei Darussalam")); - db.insert("bg", QT_TR_NOOP("Bulgaria")); db.insert("bf", QT_TR_NOOP("Burkina Faso")); + db.insert("bg", QT_TR_NOOP("Bulgaria")); + db.insert("bh", QT_TR_NOOP("Bahrain")); db.insert("bi", QT_TR_NOOP("Burundi")); - db.insert("kh", QT_TR_NOOP("Cambodia")); - db.insert("cm", QT_TR_NOOP("Cameroon")); + db.insert("bj", QT_TR_NOOP("Benin")); + db.insert("bl", QT_TR_NOOP("Saint Barthelemy")); + db.insert("bm", QT_TR_NOOP("Bermuda")); + db.insert("bn", QT_TR_NOOP("Brunei Darussalam")); + db.insert("bo", QT_TR_NOOP("Bolivia")); + db.insert("br", QT_TR_NOOP("Brazil")); + db.insert("bs", QT_TR_NOOP("Bahamas")); + db.insert("bt", QT_TR_NOOP("Bhutan")); + db.insert("bv", QT_TR_NOOP("Bouvet Island")); + db.insert("bw", QT_TR_NOOP("Botswana")); + db.insert("by", QT_TR_NOOP("Belarus")); + db.insert("bz", QT_TR_NOOP("Belize")); db.insert("ca", QT_TR_NOOP("Canada")); - db.insert("cv", QT_TR_NOOP("Cape Verde")); + db.insert("cc", QT_TR_NOOP("Cocos (Keeling) Islands")); + db.insert("cd", QT_TR_NOOP("Congo, The Democratic Republic of the")); db.insert("cf", QT_TR_NOOP("Central African Republic")); - db.insert("td", QT_TR_NOOP("Chad")); + db.insert("cg", QT_TR_NOOP("Congo")); + db.insert("ch", QT_TR_NOOP("Switzerland")); + db.insert("ci", QT_TR_NOOP("Cote D'Ivoire")); + db.insert("ck", QT_TR_NOOP("Cook Islands")); db.insert("cl", QT_TR_NOOP("Chile")); + db.insert("cm", QT_TR_NOOP("Cameroon")); db.insert("cn", QT_TR_NOOP("China")); db.insert("co", QT_TR_NOOP("Colombia")); - db.insert("km", QT_TR_NOOP("Comoros")); - db.insert("cd", QT_TR_NOOP("Congo, The Democratic Republic of the")); - db.insert("cg", QT_TR_NOOP("Congo")); db.insert("cr", QT_TR_NOOP("Costa Rica")); - db.insert("ci", QT_TR_NOOP("Cote d’Ivoire")); - db.insert("hr", QT_TR_NOOP("Croatia")); db.insert("cu", QT_TR_NOOP("Cuba")); + db.insert("cv", QT_TR_NOOP("Cape Verde")); + db.insert("cx", QT_TR_NOOP("Christmas Island")); db.insert("cy", QT_TR_NOOP("Cyprus")); db.insert("cz", QT_TR_NOOP("Czech Republic")); - db.insert("dk", QT_TR_NOOP("Denmark")); + db.insert("de", QT_TR_NOOP("Germany")); db.insert("dj", QT_TR_NOOP("Djibouti")); + db.insert("dk", QT_TR_NOOP("Denmark")); db.insert("dm", QT_TR_NOOP("Dominica")); db.insert("do", QT_TR_NOOP("Dominican Republic")); + db.insert("dz", QT_TR_NOOP("Algeria")); db.insert("ec", QT_TR_NOOP("Ecuador")); + db.insert("ee", QT_TR_NOOP("Estonia")); db.insert("eg", QT_TR_NOOP("Egypt")); - db.insert("sv", QT_TR_NOOP("El Salvador")); - db.insert("gq", QT_TR_NOOP("Equatorial Guinea")); + db.insert("eh", QT_TR_NOOP("Western Sahara")); db.insert("er", QT_TR_NOOP("Eritrea")); - db.insert("ee", QT_TR_NOOP("Estonia")); - db.insert("et", QT_TR_NOOP("Ethiopia ")); - db.insert("fj", QT_TR_NOOP("Fiji ")); - db.insert("fi", QT_TR_NOOP("Finland ")); + db.insert("es", QT_TR_NOOP("Spain")); + db.insert("et", QT_TR_NOOP("Ethiopia")); + db.insert("eu", QT_TR_NOOP("Europe")); + db.insert("fi", QT_TR_NOOP("Finland")); + db.insert("fj", QT_TR_NOOP("Fiji")); + db.insert("fk", QT_TR_NOOP("Falkland Islands (Malvinas)")); + db.insert("fm", QT_TR_NOOP("Micronesia, Federated States of")); + db.insert("fo", QT_TR_NOOP("Faroe Islands")); db.insert("fr", QT_TR_NOOP("France")); db.insert("ga", QT_TR_NOOP("Gabon")); - db.insert("gm", QT_TR_NOOP("Gambia")); + db.insert("gb", QT_TR_NOOP("United Kingdom")); + db.insert("gd", QT_TR_NOOP("Grenada")); db.insert("ge", QT_TR_NOOP("Georgia")); - db.insert("de", QT_TR_NOOP("Germany")); + db.insert("gf", QT_TR_NOOP("French Guiana")); + db.insert("gg", QT_TR_NOOP("Guernsey")); db.insert("gh", QT_TR_NOOP("Ghana")); - db.insert("gr", QT_TR_NOOP("Greece ")); - db.insert("gd", QT_TR_NOOP("Grenada")); - db.insert("gt", QT_TR_NOOP("Guatemala")); - db.insert("gu", QT_TR_NOOP("Guam ")); + db.insert("gi", QT_TR_NOOP("Gibraltar")); + db.insert("gl", QT_TR_NOOP("Greenland")); + db.insert("gm", QT_TR_NOOP("Gambia")); db.insert("gn", QT_TR_NOOP("Guinea")); + db.insert("gp", QT_TR_NOOP("Guadeloupe")); + db.insert("gq", QT_TR_NOOP("Equatorial Guinea")); + db.insert("gr", QT_TR_NOOP("Greece")); + db.insert("gs", QT_TR_NOOP("South Georgia and the South Sandwich Islands")); + db.insert("gt", QT_TR_NOOP("Guatemala")); + db.insert("gu", QT_TR_NOOP("Guam")); db.insert("gw", QT_TR_NOOP("Guinea-Bissau")); db.insert("gy", QT_TR_NOOP("Guyana")); db.insert("hk", QT_TR_NOOP("Hong Kong")); - db.insert("ht", QT_TR_NOOP("Haiti")); + db.insert("hm", QT_TR_NOOP("Heard Island and McDonald Islands")); db.insert("hn", QT_TR_NOOP("Honduras")); - db.insert("hu", QT_TR_NOOP("Hungary ")); - db.insert("is", QT_TR_NOOP("Iceland ")); - db.insert("in", QT_TR_NOOP("India ")); - db.insert("id", QT_TR_NOOP("Indonesia ")); - db.insert("ir", QT_TR_NOOP("Iran ")); - db.insert("iq", QT_TR_NOOP("Iraq ")); - db.insert("ie", QT_TR_NOOP("Ireland ")); + db.insert("hr", QT_TR_NOOP("Croatia")); + db.insert("ht", QT_TR_NOOP("Haiti")); + db.insert("hu", QT_TR_NOOP("Hungary")); + db.insert("id", QT_TR_NOOP("Indonesia")); + db.insert("ie", QT_TR_NOOP("Ireland")); db.insert("il", QT_TR_NOOP("Israel")); + db.insert("im", QT_TR_NOOP("Isle of Man")); + db.insert("in", QT_TR_NOOP("India")); + db.insert("io", QT_TR_NOOP("British Indian Ocean Territory")); + db.insert("iq", QT_TR_NOOP("Iraq")); + db.insert("ir", QT_TR_NOOP("Iran, Islamic Republic of")); + db.insert("is", QT_TR_NOOP("Iceland")); db.insert("it", QT_TR_NOOP("Italy")); + db.insert("je", QT_TR_NOOP("Jersey")); db.insert("jm", QT_TR_NOOP("Jamaica")); - db.insert("jp", QT_TR_NOOP("Japan")); db.insert("jo", QT_TR_NOOP("Jordan")); - db.insert("kz", QT_TR_NOOP("Kazakhstan")); + db.insert("jp", QT_TR_NOOP("Japan")); db.insert("ke", QT_TR_NOOP("Kenya")); + db.insert("kg", QT_TR_NOOP("Kyrgyzstan")); + db.insert("kh", QT_TR_NOOP("Cambodia")); db.insert("ki", QT_TR_NOOP("Kiribati")); - db.insert("kp", QT_TR_NOOP("Korea, North ")); - db.insert("kr", QT_TR_NOOP("Korea, South ")); + db.insert("km", QT_TR_NOOP("Comoros")); + db.insert("kn", QT_TR_NOOP("Saint Kitts and Nevis")); + db.insert("kp", QT_TR_NOOP("Korea, Democratic People's Republic of")); + db.insert("kr", QT_TR_NOOP("Korea, Republic of")); db.insert("kw", QT_TR_NOOP("Kuwait")); - db.insert("kg", QT_TR_NOOP("Kyrgyzstan")); - db.insert("la", QT_TR_NOOP("Laos")); - db.insert("lv", QT_TR_NOOP("Latvia")); + db.insert("ky", QT_TR_NOOP("Cayman Islands")); + db.insert("kz", QT_TR_NOOP("Kazakhstan")); + db.insert("la", QT_TR_NOOP("Lao People's Democratic Republic")); db.insert("lb", QT_TR_NOOP("Lebanon")); - db.insert("ls", QT_TR_NOOP("Lesotho")); - db.insert("lr", QT_TR_NOOP("Liberia")); - db.insert("ly", QT_TR_NOOP("Libya ")); + db.insert("lc", QT_TR_NOOP("Saint Lucia")); db.insert("li", QT_TR_NOOP("Liechtenstein")); + db.insert("lk", QT_TR_NOOP("Sri Lanka")); + db.insert("lr", QT_TR_NOOP("Liberia")); + db.insert("ls", QT_TR_NOOP("Lesotho")); db.insert("lt", QT_TR_NOOP("Lithuania")); db.insert("lu", QT_TR_NOOP("Luxembourg")); - db.insert("mk", QT_TR_NOOP("Macedonia")); + db.insert("lv", QT_TR_NOOP("Latvia")); + db.insert("ly", QT_TR_NOOP("Libyan Arab Jamahiriya")); + db.insert("ma", QT_TR_NOOP("Morocco")); + db.insert("mc", QT_TR_NOOP("Monaco")); + db.insert("md", QT_TR_NOOP("Moldova, Republic of")); + db.insert("me", QT_TR_NOOP("Montenegro")); + db.insert("mf", QT_TR_NOOP("Saint Martin")); db.insert("mg", QT_TR_NOOP("Madagascar")); - db.insert("mw", QT_TR_NOOP("Malawi")); - db.insert("my", QT_TR_NOOP("Malaysia")); - db.insert("mv", QT_TR_NOOP("Maldives ")); - db.insert("ml", QT_TR_NOOP("Mali")); - db.insert("mt", QT_TR_NOOP("Malta")); db.insert("mh", QT_TR_NOOP("Marshall Islands")); + db.insert("mk", QT_TR_NOOP("Macedonia")); + db.insert("ml", QT_TR_NOOP("Mali")); + db.insert("mm", QT_TR_NOOP("Myanmar")); + db.insert("mn", QT_TR_NOOP("Mongolia")); + db.insert("mo", QT_TR_NOOP("Macau")); + db.insert("mp", QT_TR_NOOP("Northern Mariana Islands")); + db.insert("mq", QT_TR_NOOP("Martinique")); db.insert("mr", QT_TR_NOOP("Mauritania")); + db.insert("ms", QT_TR_NOOP("Montserrat")); + db.insert("mt", QT_TR_NOOP("Malta")); db.insert("mu", QT_TR_NOOP("Mauritius")); - db.insert("mx", QT_TR_NOOP("Mexico ")); - db.insert("fm", QT_TR_NOOP("Micronesia")); - db.insert("md", QT_TR_NOOP("Moldova")); - db.insert("mc", QT_TR_NOOP("Monaco")); - db.insert("mn", QT_TR_NOOP("Mongolia")); - db.insert("me", QT_TR_NOOP("Montenegro")); - db.insert("ma", QT_TR_NOOP("Morocco")); + db.insert("mv", QT_TR_NOOP("Maldives")); + db.insert("mw", QT_TR_NOOP("Malawi")); + db.insert("mx", QT_TR_NOOP("Mexico")); + db.insert("my", QT_TR_NOOP("Malaysia")); db.insert("mz", QT_TR_NOOP("Mozambique")); - db.insert("mm", QT_TR_NOOP("Myanmar ")); db.insert("na", QT_TR_NOOP("Namibia")); - db.insert("nr", QT_TR_NOOP("Nauru")); - db.insert("np", QT_TR_NOOP("Nepal")); - db.insert("nl", QT_TR_NOOP("Netherlands")); - db.insert("nz", QT_TR_NOOP("New Zealand")); - db.insert("ni", QT_TR_NOOP("Nicaragua")); + db.insert("nc", QT_TR_NOOP("New Caledonia")); db.insert("ne", QT_TR_NOOP("Niger")); + db.insert("nf", QT_TR_NOOP("Norfolk Island")); db.insert("ng", QT_TR_NOOP("Nigeria")); + db.insert("ni", QT_TR_NOOP("Nicaragua")); + db.insert("nl", QT_TR_NOOP("Netherlands")); db.insert("no", QT_TR_NOOP("Norway")); + db.insert("np", QT_TR_NOOP("Nepal")); + db.insert("nr", QT_TR_NOOP("Nauru")); + db.insert("nu", QT_TR_NOOP("Niue")); + db.insert("nz", QT_TR_NOOP("New Zealand")); db.insert("om", QT_TR_NOOP("Oman")); - db.insert("pk", QT_TR_NOOP("Pakistan")); - db.insert("pw", QT_TR_NOOP("Palau")); - db.insert("ps", QT_TR_NOOP("Palestine")); db.insert("pa", QT_TR_NOOP("Panama")); - db.insert("pg", QT_TR_NOOP("Papua New Guinea")); - db.insert("py", QT_TR_NOOP("Paraguay")); db.insert("pe", QT_TR_NOOP("Peru")); + db.insert("pf", QT_TR_NOOP("French Polynesia")); + db.insert("pg", QT_TR_NOOP("Papua New Guinea")); db.insert("ph", QT_TR_NOOP("Philippines")); + db.insert("pk", QT_TR_NOOP("Pakistan")); db.insert("pl", QT_TR_NOOP("Poland")); + db.insert("pm", QT_TR_NOOP("Saint Pierre and Miquelon")); + db.insert("pn", QT_TR_NOOP("Pitcairn Islands")); + db.insert("pr", QT_TR_NOOP("Puerto Rico")); + db.insert("ps", QT_TR_NOOP("Palestinian Territory, Occupied")); db.insert("pt", QT_TR_NOOP("Portugal")); + db.insert("pw", QT_TR_NOOP("Palau")); + db.insert("py", QT_TR_NOOP("Paraguay")); db.insert("qa", QT_TR_NOOP("Qatar")); + db.insert("re", QT_TR_NOOP("Reunion")); db.insert("ro", QT_TR_NOOP("Romania")); - db.insert("ru", QT_TR_NOOP("Russia")); + db.insert("rs", QT_TR_NOOP("Serbia")); + db.insert("ru", QT_TR_NOOP("Russian Federation")); db.insert("rw", QT_TR_NOOP("Rwanda")); - db.insert("kn", QT_TR_NOOP("Saint Kitts & Nevis")); - db.insert("lc", QT_TR_NOOP("Saint Lucia")); - db.insert("vc", QT_TR_NOOP("Saint Vincent & the Grenadines")); - db.insert("ws", QT_TR_NOOP("Samoa")); - db.insert("sm", QT_TR_NOOP("San Marino")); - db.insert("st", QT_TR_NOOP("Sao Tome & Principe")); db.insert("sa", QT_TR_NOOP("Saudi Arabia")); - db.insert("sn", QT_TR_NOOP("Senegal")); - db.insert("rs", QT_TR_NOOP("Serbia")); + db.insert("sb", QT_TR_NOOP("Solomon Islands")); db.insert("sc", QT_TR_NOOP("Seychelles")); - db.insert("sl", QT_TR_NOOP("Sierra Leone")); + db.insert("sd", QT_TR_NOOP("Sudan")); + db.insert("se", QT_TR_NOOP("Sweden")); db.insert("sg", QT_TR_NOOP("Singapore")); - db.insert("sk", QT_TR_NOOP("Slovakia")); + db.insert("sh", QT_TR_NOOP("Saint Helena")); db.insert("si", QT_TR_NOOP("Slovenia")); - db.insert("sb", QT_TR_NOOP("Solomon Islands")); + db.insert("sj", QT_TR_NOOP("Svalbard and Jan Mayen")); + db.insert("sk", QT_TR_NOOP("Slovakia")); + db.insert("sl", QT_TR_NOOP("Sierra Leone")); + db.insert("sm", QT_TR_NOOP("San Marino")); + db.insert("sn", QT_TR_NOOP("Senegal")); db.insert("so", QT_TR_NOOP("Somalia")); - db.insert("za", QT_TR_NOOP("South Africa")); - db.insert("es", QT_TR_NOOP("Spain")); - db.insert("lk", QT_TR_NOOP("Sri Lanka")); - db.insert("sd", QT_TR_NOOP("Sudan")); db.insert("sr", QT_TR_NOOP("Suriname")); + db.insert("st", QT_TR_NOOP("Sao Tome and Principe")); + db.insert("sv", QT_TR_NOOP("El Salvador")); + db.insert("sy", QT_TR_NOOP("Syrian Arab Republic")); db.insert("sz", QT_TR_NOOP("Swaziland")); - db.insert("se", QT_TR_NOOP("Sweden")); - db.insert("ch", QT_TR_NOOP("Switzerland")); - db.insert("sy", QT_TR_NOOP("Syria")); - db.insert("tw", QT_TR_NOOP("Taiwan ")); - db.insert("tj", QT_TR_NOOP("Tajikistan")); - db.insert("tz", QT_TR_NOOP("Tanzania")); - db.insert("th", QT_TR_NOOP("Thailand")); - db.insert("tl", QT_TR_NOOP("Timor-Leste (East Timor)")); + db.insert("tc", QT_TR_NOOP("Turks and Caicos Islands")); + db.insert("td", QT_TR_NOOP("Chad")); + db.insert("tf", QT_TR_NOOP("French Southern Territories")); db.insert("tg", QT_TR_NOOP("Togo")); - db.insert("to", QT_TR_NOOP("Tonga")); - db.insert("tt", QT_TR_NOOP("Trinidad & Tobago")); + db.insert("th", QT_TR_NOOP("Thailand")); + db.insert("tj", QT_TR_NOOP("Tajikistan")); + db.insert("tk", QT_TR_NOOP("Tokelau")); + db.insert("tl", QT_TR_NOOP("Timor-Leste")); + db.insert("tm", QT_TR_NOOP("Turkmenistan")); db.insert("tn", QT_TR_NOOP("Tunisia")); + db.insert("to", QT_TR_NOOP("Tonga")); db.insert("tr", QT_TR_NOOP("Turkey")); - db.insert("tm", QT_TR_NOOP("Turkmenistan")); + db.insert("tt", QT_TR_NOOP("Trinidad and Tobago")); db.insert("tv", QT_TR_NOOP("Tuvalu")); - db.insert("ug", QT_TR_NOOP("Uganda")); + db.insert("tw", QT_TR_NOOP("Taiwan")); + db.insert("tz", QT_TR_NOOP("Tanzania, United Republic of")); db.insert("ua", QT_TR_NOOP("Ukraine")); - db.insert("ae", QT_TR_NOOP("United Arab Emirates")); - db.insert("gb", QT_TR_NOOP("United Kingdom")); + db.insert("ug", QT_TR_NOOP("Uganda")); + db.insert("um", QT_TR_NOOP("United States Minor Outlying Islands")); db.insert("us", QT_TR_NOOP("United States")); db.insert("uy", QT_TR_NOOP("Uruguay")); db.insert("uz", QT_TR_NOOP("Uzbekistan")); - db.insert("vu", QT_TR_NOOP("Vanuatu")); - db.insert("va", QT_TR_NOOP("Vatican")); + db.insert("va", QT_TR_NOOP("Holy See (Vatican City State)")); + db.insert("vc", QT_TR_NOOP("Saint Vincent and the Grenadines")); db.insert("ve", QT_TR_NOOP("Venezuela")); + db.insert("vg", QT_TR_NOOP("Virgin Islands, British")); + db.insert("vi", QT_TR_NOOP("Virgin Islands, U.S.")); db.insert("vn", QT_TR_NOOP("Vietnam")); - db.insert("eh", QT_TR_NOOP("Western Sahara")); + db.insert("vu", QT_TR_NOOP("Vanuatu")); + db.insert("wf", QT_TR_NOOP("Wallis and Futuna")); + db.insert("ws", QT_TR_NOOP("Samoa")); db.insert("ye", QT_TR_NOOP("Yemen")); - db.insert("zr", QT_TR_NOOP("Zaire")); + db.insert("yt", QT_TR_NOOP("Mayotte")); + db.insert("za", QT_TR_NOOP("South Africa")); db.insert("zm", QT_TR_NOOP("Zambia")); db.insert("zw", QT_TR_NOOP("Zimbabwe")); } diff --git a/src/vidalia/res/country-coordinates.csv b/src/vidalia/res/country-coordinates.csv index f6415b1..fe806e7 100644 --- a/src/vidalia/res/country-coordinates.csv +++ b/src/vidalia/res/country-coordinates.csv @@ -1,249 +1,246 @@ -ad,42.50,1.50 -ae,24.00,54.00 -af,33.00,65.00 -ag,17.05,-61.80 -ai,18.22,-63.05 -al,41.00,20.00 -am,40.00,45.00 -an,12.17,-69.00 -ao,-12.50,18.50 -aq,-77.85,166.67 -ar,-34.00,-64.00 -as,-14.32,-170.50 -at,47.33,13.33 -au,-25.00,135.00 -aw,12.50,-69.97 -ax,60.12,19.90 -az,40.50,47.50 -ba,44.25,17.83 -bb,13.17,-59.53 -bd,24.00,90.00 -be,50.83,4.00 -bf,13.00,-2.00 -bg,43.00,25.00 -bh,26.00,50.50 -bi,-3.50,30.00 -bj,9.50,2.25 -bm,32.33,-64.75 -bn,4.50,114.67 -bo,-17.00,-65.00 -br,-10.00,-55.00 -bs,24.00,-76.00 -bt,27.50,90.50 -bv,-54.43,3.40 -bw,-22.00,24.00 -by,53.00,28.00 -bz,17.25,-88.75 -ca,60.00,-96.00 -cc,-12.17,96.83 -cd,-3.52,23.42 -cf,7.00,21.00 -cg,-1.00,15.00 -ch,47.00,8.00 -ci,8.00,-5.00 -ck,-20.00,-158.00 -cl,-30.00,-71.00 -cm,6.00,12.00 -cn,35.00,105.00 -co,4.00,-72.00 -cr,10.00,-84.00 -cs,44.8,20.5 -cu,21.50,-80.00 -cv,16.00,-24.00 -cx,-10.50,105.67 -cy,35.00,33.00 -cz,49.75,15.00 -de,51.50,10.50 -dj,11.50,42.50 -dk,56.00,10.00 -dm,15.50,-61.33 -do,19.00,-70.67 -dz,28.00,3.00 -ec,-2.00,-77.50 -ee,59.00,26.00 -eg,27.00,30.00 -eh,23.00,-14.00 -er,15.00,39.00 -es,40.00,-4.00 -et,8.00,39.00 -fi,64.00,26.00 -fj,-18.00,178.00 -fk,-51.75,-59.00 -fm,5.00,152.00 -fo,62.00,-7.00 -fr,46.00,2.00 -fx,48.87,2.33 -ga,-1.00,11.75 -gb,54.00,-4.50 -gd,12.12,-61.67 -ge,42.00,43.50 -gf,4.00,-53.00 -gg,49.45,-2.55 -gh,8.00,-2.00 -gi,36.13,-5.35 -gl,72.00,-40.00 -gm,13.50,-15.50 -gn,11.00,-10.00 -gp,16.25,-61.58 -gq,2.00,10.00 -gr,39.00,22.00 -gs,-54.50,-37.00 -gt,15.50,-90.25 -gu,13.47,144.83 -gw,12.00,-15.00 -gy,5.00,-59.00 -hk,22.25,114.17 -hm,-53.10,73.52 -hn,15.00,-86.50 -hr,45.17,15.50 -ht,19.00,-72.42 -hu,47.00,20.00 -id,-5.00,120.00 -ie,53.00,-8.00 -il,31.50,34.75 -im,54.23,-4.55 -in,20.00,77.00 -io,-6.00,71.50 -iq,33.00,44.00 -ir,32.00,53.00 -is,65.00,-18.00 -it,42.83,12.83 -je,49.19,-2.11 -jm,18.25,-77.50 -jo,31.00,36.00 -jp,36.00,138.00 -ke,1.00,38.00 -kg,41.00,75.00 -kh,13.00,105.00 -ki,-5.00,-170.00 -km,-12.17,44.25 -kn,17.33,-62.75 -kp,40.00,127.00 -kr,37.00,127.50 -kw,29.50,47.75 -ky,19.50,-80.67 -kz,48.00,68.00 -la,18.00,105.00 -lb,33.83,35.83 -lc,13.88,-60.97 -li,47.17,9.53 -lk,7.00,81.00 -lr,6.50,-9.50 -ls,-29.50,28.25 -lt,56.00,24.00 -lu,49.75,6.17 -lv,57.00,25.00 -ly,25.00,17.00 -ma,32.00,-5.00 -mc,43.73,7.42 -md,47.00,29.00 -me,42.80,19.20 -mg,-20.00,47.00 -mh,11.00,168.00 -mk,41.83,22.00 -ml,17.00,-4.00 -mm,22.00,98.00 -mn,46.00,105.00 -mo,22.00,113.00 -mp,15.12,145.67 -mq,14.67,-61.00 -mr,20.00,-12.00 -ms,16.75,-62.20 -mt,35.92,14.42 -mu,-20.30,57.58 -mv,3.20,73.00 -mw,-13.50,34.00 -mx,23.00,-102.00 -my,2.50,112.50 -mz,-18.25,35.00 -na,-22.00,17.00 -nc,-21.50,165.50 -ne,16.00,8.00 -nf,-29.08,167.92 -ng,10.00,8.00 -ni,13.00,-85.00 -nl,52.50,5.75 -no,62.00,10.00 -np,28.00,84.00 -nr,-0.53,166.92 -nu,-19.03,-169.87 -nz,-42.00,174.00 -om,21.00,57.00 -pa,9.00,-80.00 -pe,-10.00,-76.00 -pf,-15.00,-140.00 -pg,-6.00,147.00 -ph,13.00,122.00 -pk,30.00,70.00 -pl,52.00,20.00 -pm,46.83,-56.33 -pn,-25.07,-130.08 -pr,18.23,-66.55 -ps,32.0000,35.2500 -pt,39.50,-8.00 -pw,6.00,134.00 -py,-23.00,-58.00 -qa,25.50,51.25 -re,-21.10,55.60 -ro,46.00,25.00 -rs,43.80,21.00 -ru,60.00,47.00 -rw,-2.00,30.00 -sa,25.00,45.00 -sb,-8.00,159.00 -sc,-4.58,55.67 -sd,15.00,30.00 -se,62.00,15.00 -sg,1.37,103.80 -sh,-15.95,-5.70 -si,46.25,15.17 -sj,78.00,20.00 -sk,48.67,19.50 -sl,8.50,-11.50 -sm,43.93,12.42 -sn,14.00,-14.00 -so,6.00,48.00 -sr,4.00,-56.00 -st,1.00,7.00 -su,60.00,47.00 -sv,13.83,-88.92 -sy,35.00,38.00 -sz,-26.50,31.50 -tc,21.73,-71.58 -td,15.00,19.00 -tf,-43.00,67.00 -tg,8.00,1.17 -th,15.00,100.00 -tj,39.00,71.00 -tk,-9.00,-171.75 -tm,40.00,60.00 -tn,34.00,9.00 -to,-20.00,-175.00 -tp,-9.00,125.00 -tr,39.00,35.00 -tt,11.00,-61.00 -tv,-8.00,178.00 -tw,23.50,121.00 -tz,-6.00,35.00 -ua,49.00,32.00 -ug,2.00,33.00 -um,10.00,-175.00 -us,38.00,-98.00 -uy,-33.00,-56.00 -uz,41.00,64.00 -va,41.90,12.45 -vc,13.08,-61.20 -ve,8.00,-66.00 -vg,18.50,-64.50 -vi,18.50,-64.43 -vn,16.00,106.00 -vu,-16.00,167.00 -wf,-14.00,-177.00 -ws,-13.58,-172.33 -ye,15.50,47.50 -yt,-12.83,45.17 -yu,44.00,21.00 -za,-30.00,26.00 -zm,-15.00,30.00 -zr,-1.00,22.00 -zw,-19.00,29.00 +ad,42.50,1.50 +ae,24.00,54.00 +af,33.00,65.00 +ag,17.05,-61.80 +ai,18.22,-63.05 +al,41.00,20.00 +am,40.00,45.00 +an,12.17,-69.00 +ao,-12.50,18.50 +aq,-77.85,166.67 +ar,-34.00,-64.00 +as,-14.32,-170.50 +at,47.33,13.33 +au,-25.00,135.00 +aw,12.50,-69.97 +ax,60.12,19.90 +az,40.50,47.50 +ba,44.25,17.83 +bb,13.17,-59.53 +bd,24.00,90.00 +be,50.83,4.00 +bf,13.00,-2.00 +bg,43.00,25.00 +bh,26.00,50.50 +bi,-3.50,30.00 +bj,9.50,2.25 +bl,17.896,-62.828 +bm,32.33,-64.75 +bn,4.50,114.67 +bo,-17.00,-65.00 +br,-10.00,-55.00 +bs,24.00,-76.00 +bt,27.50,90.50 +bv,-54.43,3.40 +bw,-22.00,24.00 +by,53.00,28.00 +bz,17.25,-88.75 +ca,60.00,-96.00 +cc,-12.17,96.83 +cd,-3.52,23.42 +cf,7.00,21.00 +cg,-1.00,15.00 +ch,47.00,8.00 +ci,8.00,-5.00 +ck,-20.00,-158.00 +cl,-30.00,-71.00 +cm,6.00,12.00 +cn,35.00,105.00 +co,4.00,-72.00 +cr,10.00,-84.00 +cu,21.50,-80.00 +cv,16.00,-24.00 +cx,-10.50,105.67 +cy,35.00,33.00 +cz,49.75,15.00 +de,51.50,10.50 +dj,11.50,42.50 +dk,56.00,10.00 +dm,15.50,-61.33 +do,19.00,-70.67 +dz,28.00,3.00 +ec,-2.00,-77.50 +ee,59.00,26.00 +eg,27.00,30.00 +eh,23.00,-14.00 +er,15.00,39.00 +es,40.00,-4.00 +et,8.00,39.00 +fi,64.00,26.00 +fj,-18.00,178.00 +fk,-51.75,-59.00 +fm,5.00,152.00 +fo,62.00,-7.00 +fr,46.00,2.00 +ga,-1.00,11.75 +gb,54.00,-4.50 +gd,12.12,-61.67 +ge,42.00,43.50 +gf,4.00,-53.00 +gg,49.45,-2.55 +gh,8.00,-2.00 +gi,36.13,-5.35 +gl,72.00,-40.00 +gm,13.50,-15.50 +gn,11.00,-10.00 +gp,16.25,-61.58 +gq,2.00,10.00 +gr,39.00,22.00 +gs,-54.50,-37.00 +gt,15.50,-90.25 +gu,13.47,144.83 +gw,12.00,-15.00 +gy,5.00,-59.00 +hk,22.25,114.17 +hm,-53.10,73.52 +hn,15.00,-86.50 +hr,45.17,15.50 +ht,19.00,-72.42 +hu,47.00,20.00 +id,-5.00,120.00 +ie,53.00,-8.00 +il,31.50,34.75 +im,54.23,-4.55 +in,20.00,77.00 +io,-6.00,71.50 +iq,33.00,44.00 +ir,32.00,53.00 +is,65.00,-18.00 +it,42.83,12.83 +je,49.19,-2.11 +jm,18.25,-77.50 +jo,31.00,36.00 +jp,36.00,138.00 +ke,1.00,38.00 +kg,41.00,75.00 +kh,13.00,105.00 +ki,-5.00,-170.00 +km,-12.17,44.25 +kn,17.33,-62.75 +kp,40.00,127.00 +kr,37.00,127.50 +kw,29.50,47.75 +ky,19.50,-80.67 +kz,48.00,68.00 +la,18.00,105.00 +lb,33.83,35.83 +lc,13.88,-60.97 +li,47.17,9.53 +lk,7.00,81.00 +lr,6.50,-9.50 +ls,-29.50,28.25 +lt,56.00,24.00 +lu,49.75,6.17 +lv,57.00,25.00 +ly,25.00,17.00 +ma,32.00,-5.00 +mc,43.73,7.42 +md,47.00,29.00 +me,42.80,19.20 +mf,18.08,-63.05 +mg,-20.00,47.00 +mh,11.00,168.00 +mk,41.83,22.00 +ml,17.00,-4.00 +mm,22.00,98.00 +mn,46.00,105.00 +mo,22.00,113.00 +mp,15.12,145.67 +mq,14.67,-61.00 +mr,20.00,-12.00 +ms,16.75,-62.20 +mt,35.92,14.42 +mu,-20.30,57.58 +mv,3.20,73.00 +mw,-13.50,34.00 +mx,23.00,-102.00 +my,2.50,112.50 +mz,-18.25,35.00 +na,-22.00,17.00 +nc,-21.50,165.50 +ne,16.00,8.00 +nf,-29.08,167.92 +ng,10.00,8.00 +ni,13.00,-85.00 +nl,52.50,5.75 +no,62.00,10.00 +np,28.00,84.00 +nr,-0.53,166.92 +nu,-19.03,-169.87 +nz,-42.00,174.00 +om,21.00,57.00 +pa,9.00,-80.00 +pe,-10.00,-76.00 +pf,-15.00,-140.00 +pg,-6.00,147.00 +ph,13.00,122.00 +pk,30.00,70.00 +pl,52.00,20.00 +pm,46.83,-56.33 +pn,-25.07,-130.08 +pr,18.23,-66.55 +ps,32.0000,35.2500 +pt,39.50,-8.00 +pw,6.00,134.00 +py,-23.00,-58.00 +qa,25.50,51.25 +re,-21.10,55.60 +ro,46.00,25.00 +rs,43.80,21.00 +ru,60.00,47.00 +rw,-2.00,30.00 +sa,25.00,45.00 +sb,-8.00,159.00 +sc,-4.58,55.67 +sd,15.00,30.00 +se,62.00,15.00 +sg,1.37,103.80 +sh,-15.95,-5.70 +si,46.25,15.17 +sj,78.00,20.00 +sk,48.67,19.50 +sl,8.50,-11.50 +sm,43.93,12.42 +sn,14.00,-14.00 +so,6.00,48.00 +sr,4.00,-56.00 +st,1.00,7.00 +sv,13.83,-88.92 +sy,35.00,38.00 +sz,-26.50,31.50 +tc,21.73,-71.58 +td,15.00,19.00 +tf,-43.00,67.00 +tg,8.00,1.17 +th,15.00,100.00 +tj,39.00,71.00 +tk,-9.00,-171.75 +tl,-8.93,125.79 +tm,40.00,60.00 +tn,34.00,9.00 +to,-20.00,-175.00 +tr,39.00,35.00 +tt,11.00,-61.00 +tv,-8.00,178.00 +tw,23.50,121.00 +tz,-6.00,35.00 +ua,49.00,32.00 +ug,2.00,33.00 +um,10.00,-175.00 +us,38.00,-98.00 +uy,-33.00,-56.00 +uz,41.00,64.00 +va,41.90,12.45 +vc,13.08,-61.20 +ve,8.00,-66.00 +vg,18.50,-64.50 +vi,18.50,-64.43 +vn,16.00,106.00 +vu,-16.00,167.00 +wf,-14.00,-177.00 +ws,-13.58,-172.33 +ye,15.50,47.50 +yt,-12.83,45.17 +za,-30.00,26.00 +zm,-15.00,30.00 +zw,-19.00,29.00 diff --git a/src/vidalia/res/flags/ad.png b/src/vidalia/res/flags/ad.png new file mode 100644 index 0000000..1c5a5ae Binary files /dev/null and b/src/vidalia/res/flags/ad.png differ diff --git a/src/vidalia/res/flags/ae.png b/src/vidalia/res/flags/ae.png index 407a5bb..ee61b7b 100644 Binary files a/src/vidalia/res/flags/ae.png and b/src/vidalia/res/flags/ae.png differ diff --git a/src/vidalia/res/flags/af.png b/src/vidalia/res/flags/af.png index ba01b2b..b68c442 100644 Binary files a/src/vidalia/res/flags/af.png and b/src/vidalia/res/flags/af.png differ diff --git a/src/vidalia/res/flags/ag.png b/src/vidalia/res/flags/ag.png new file mode 100644 index 0000000..c6e442f Binary files /dev/null and b/src/vidalia/res/flags/ag.png differ diff --git a/src/vidalia/res/flags/ai.png b/src/vidalia/res/flags/ai.png new file mode 100644 index 0000000..c604f75 Binary files /dev/null and b/src/vidalia/res/flags/ai.png differ diff --git a/src/vidalia/res/flags/al.png b/src/vidalia/res/flags/al.png index 06e9cac..5a610f9 100644 Binary files a/src/vidalia/res/flags/al.png and b/src/vidalia/res/flags/al.png differ diff --git a/src/vidalia/res/flags/am.png b/src/vidalia/res/flags/am.png index d26210c..548097a 100644 Binary files a/src/vidalia/res/flags/am.png and b/src/vidalia/res/flags/am.png differ diff --git a/src/vidalia/res/flags/an.png b/src/vidalia/res/flags/an.png index e05e6f8..91661db 100644 Binary files a/src/vidalia/res/flags/an.png and b/src/vidalia/res/flags/an.png differ diff --git a/src/vidalia/res/flags/ao.png b/src/vidalia/res/flags/ao.png index 5652c15..825236d 100644 Binary files a/src/vidalia/res/flags/ao.png and b/src/vidalia/res/flags/ao.png differ diff --git a/src/vidalia/res/flags/aq.png b/src/vidalia/res/flags/aq.png new file mode 100644 index 0000000..3e38f98 Binary files /dev/null and b/src/vidalia/res/flags/aq.png differ diff --git a/src/vidalia/res/flags/ar.png b/src/vidalia/res/flags/ar.png index 95bfc28..ceb15a9 100644 Binary files a/src/vidalia/res/flags/ar.png and b/src/vidalia/res/flags/ar.png differ diff --git a/src/vidalia/res/flags/as.png b/src/vidalia/res/flags/as.png new file mode 100644 index 0000000..e22d480 Binary files /dev/null and b/src/vidalia/res/flags/as.png differ diff --git a/src/vidalia/res/flags/at.png b/src/vidalia/res/flags/at.png index 73c287e..3e6f853 100644 Binary files a/src/vidalia/res/flags/at.png and b/src/vidalia/res/flags/at.png differ diff --git a/src/vidalia/res/flags/au.png b/src/vidalia/res/flags/au.png index 11ae4ce..8a32372 100644 Binary files a/src/vidalia/res/flags/au.png and b/src/vidalia/res/flags/au.png differ diff --git a/src/vidalia/res/flags/aw.png b/src/vidalia/res/flags/aw.png index 5a3fbdd..4de8177 100644 Binary files a/src/vidalia/res/flags/aw.png and b/src/vidalia/res/flags/aw.png differ diff --git a/src/vidalia/res/flags/ax.png b/src/vidalia/res/flags/ax.png new file mode 100644 index 0000000..d2bd166 Binary files /dev/null and b/src/vidalia/res/flags/ax.png differ diff --git a/src/vidalia/res/flags/az.png b/src/vidalia/res/flags/az.png index e6482a6..584369a 100644 Binary files a/src/vidalia/res/flags/az.png and b/src/vidalia/res/flags/az.png differ diff --git a/src/vidalia/res/flags/ba.png b/src/vidalia/res/flags/ba.png index 765d125..d7c5e3c 100644 Binary files a/src/vidalia/res/flags/ba.png and b/src/vidalia/res/flags/ba.png differ diff --git a/src/vidalia/res/flags/bb.png b/src/vidalia/res/flags/bb.png index 31ec713..fc67712 100644 Binary files a/src/vidalia/res/flags/bb.png and b/src/vidalia/res/flags/bb.png differ diff --git a/src/vidalia/res/flags/bd.png b/src/vidalia/res/flags/bd.png index 3063438..620ec1e 100644 Binary files a/src/vidalia/res/flags/bd.png and b/src/vidalia/res/flags/bd.png differ diff --git a/src/vidalia/res/flags/be.png b/src/vidalia/res/flags/be.png index 6b6fe60..c1044f3 100644 Binary files a/src/vidalia/res/flags/be.png and b/src/vidalia/res/flags/be.png differ diff --git a/src/vidalia/res/flags/bf.png b/src/vidalia/res/flags/bf.png index 94802b8..a0bebc0 100644 Binary files a/src/vidalia/res/flags/bf.png and b/src/vidalia/res/flags/bf.png differ diff --git a/src/vidalia/res/flags/bg.png b/src/vidalia/res/flags/bg.png index 6572ba7..928f658 100644 Binary files a/src/vidalia/res/flags/bg.png and b/src/vidalia/res/flags/bg.png differ diff --git a/src/vidalia/res/flags/bh.png b/src/vidalia/res/flags/bh.png index 3461737..04421ce 100644 Binary files a/src/vidalia/res/flags/bh.png and b/src/vidalia/res/flags/bh.png differ diff --git a/src/vidalia/res/flags/bi.png b/src/vidalia/res/flags/bi.png index fc21beb..ee3b383 100644 Binary files a/src/vidalia/res/flags/bi.png and b/src/vidalia/res/flags/bi.png differ diff --git a/src/vidalia/res/flags/bj.png b/src/vidalia/res/flags/bj.png index ee88cdf..140276d 100644 Binary files a/src/vidalia/res/flags/bj.png and b/src/vidalia/res/flags/bj.png differ diff --git a/src/vidalia/res/flags/bl.png b/src/vidalia/res/flags/bl.png new file mode 100644 index 0000000..cd1743a Binary files /dev/null and b/src/vidalia/res/flags/bl.png differ diff --git a/src/vidalia/res/flags/bm.png b/src/vidalia/res/flags/bm.png index 10defba..b4e2eef 100644 Binary files a/src/vidalia/res/flags/bm.png and b/src/vidalia/res/flags/bm.png differ diff --git a/src/vidalia/res/flags/bn.png b/src/vidalia/res/flags/bn.png index 3edc2f8..9a080e7 100644 Binary files a/src/vidalia/res/flags/bn.png and b/src/vidalia/res/flags/bn.png differ diff --git a/src/vidalia/res/flags/bo.png b/src/vidalia/res/flags/bo.png index bbfee3e..e007900 100644 Binary files a/src/vidalia/res/flags/bo.png and b/src/vidalia/res/flags/bo.png differ diff --git a/src/vidalia/res/flags/br.png b/src/vidalia/res/flags/br.png index 1b4a7ec..f2a04ca 100644 Binary files a/src/vidalia/res/flags/br.png and b/src/vidalia/res/flags/br.png differ diff --git a/src/vidalia/res/flags/bs.png b/src/vidalia/res/flags/bs.png index 32daa6d..9296b35 100644 Binary files a/src/vidalia/res/flags/bs.png and b/src/vidalia/res/flags/bs.png differ diff --git a/src/vidalia/res/flags/bt.png b/src/vidalia/res/flags/bt.png index 6d08ec1..0daede3 100644 Binary files a/src/vidalia/res/flags/bt.png and b/src/vidalia/res/flags/bt.png differ diff --git a/src/vidalia/res/flags/bv.png b/src/vidalia/res/flags/bv.png new file mode 100644 index 0000000..b7b6fd5 Binary files /dev/null and b/src/vidalia/res/flags/bv.png differ diff --git a/src/vidalia/res/flags/bw.png b/src/vidalia/res/flags/bw.png index b667c69..6bee7d6 100644 Binary files a/src/vidalia/res/flags/bw.png and b/src/vidalia/res/flags/bw.png differ diff --git a/src/vidalia/res/flags/by.png b/src/vidalia/res/flags/by.png index 4b3935d..aed37f1 100644 Binary files a/src/vidalia/res/flags/by.png and b/src/vidalia/res/flags/by.png differ diff --git a/src/vidalia/res/flags/bz.png b/src/vidalia/res/flags/bz.png index adf568f..6a6bbe0 100644 Binary files a/src/vidalia/res/flags/bz.png and b/src/vidalia/res/flags/bz.png differ diff --git a/src/vidalia/res/flags/ca.png b/src/vidalia/res/flags/ca.png index d5013db..362af4e 100644 Binary files a/src/vidalia/res/flags/ca.png and b/src/vidalia/res/flags/ca.png differ diff --git a/src/vidalia/res/flags/cc.png b/src/vidalia/res/flags/cc.png new file mode 100644 index 0000000..21aeee6 Binary files /dev/null and b/src/vidalia/res/flags/cc.png differ diff --git a/src/vidalia/res/flags/cd.png b/src/vidalia/res/flags/cd.png new file mode 100644 index 0000000..3699bcd Binary files /dev/null and b/src/vidalia/res/flags/cd.png differ diff --git a/src/vidalia/res/flags/cf.png b/src/vidalia/res/flags/cf.png index 72e22a5..39f41f9 100644 Binary files a/src/vidalia/res/flags/cf.png and b/src/vidalia/res/flags/cf.png differ diff --git a/src/vidalia/res/flags/cg.png b/src/vidalia/res/flags/cg.png index fc32f71..1102672 100644 Binary files a/src/vidalia/res/flags/cg.png and b/src/vidalia/res/flags/cg.png differ diff --git a/src/vidalia/res/flags/ch.png b/src/vidalia/res/flags/ch.png index dc2323a..024ae45 100644 Binary files a/src/vidalia/res/flags/ch.png and b/src/vidalia/res/flags/ch.png differ diff --git a/src/vidalia/res/flags/ci.png b/src/vidalia/res/flags/ci.png index 710f35d..a005b50 100644 Binary files a/src/vidalia/res/flags/ci.png and b/src/vidalia/res/flags/ci.png differ diff --git a/src/vidalia/res/flags/ck.png b/src/vidalia/res/flags/ck.png index d43361c..d86c29f 100644 Binary files a/src/vidalia/res/flags/ck.png and b/src/vidalia/res/flags/ck.png differ diff --git a/src/vidalia/res/flags/cl.png b/src/vidalia/res/flags/cl.png index ea7b21b..740d122 100644 Binary files a/src/vidalia/res/flags/cl.png and b/src/vidalia/res/flags/cl.png differ diff --git a/src/vidalia/res/flags/cm.png b/src/vidalia/res/flags/cm.png index 318750f..8f6de19 100644 Binary files a/src/vidalia/res/flags/cm.png and b/src/vidalia/res/flags/cm.png differ diff --git a/src/vidalia/res/flags/cn.png b/src/vidalia/res/flags/cn.png index 2d1c880..bd88e1c 100644 Binary files a/src/vidalia/res/flags/cn.png and b/src/vidalia/res/flags/cn.png differ diff --git a/src/vidalia/res/flags/co.png b/src/vidalia/res/flags/co.png index 06ecdf3..9f34500 100644 Binary files a/src/vidalia/res/flags/co.png and b/src/vidalia/res/flags/co.png differ diff --git a/src/vidalia/res/flags/cr.png b/src/vidalia/res/flags/cr.png index 544333c..086b545 100644 Binary files a/src/vidalia/res/flags/cr.png and b/src/vidalia/res/flags/cr.png differ diff --git a/src/vidalia/res/flags/cu.png b/src/vidalia/res/flags/cu.png index c94f37f..2a947a3 100644 Binary files a/src/vidalia/res/flags/cu.png and b/src/vidalia/res/flags/cu.png differ diff --git a/src/vidalia/res/flags/cv.png b/src/vidalia/res/flags/cv.png index 08dd4d1..7cb10ed 100644 Binary files a/src/vidalia/res/flags/cv.png and b/src/vidalia/res/flags/cv.png differ diff --git a/src/vidalia/res/flags/cx.png b/src/vidalia/res/flags/cx.png new file mode 100644 index 0000000..842e872 Binary files /dev/null and b/src/vidalia/res/flags/cx.png differ diff --git a/src/vidalia/res/flags/cy.png b/src/vidalia/res/flags/cy.png index c8d32b1..521588c 100644 Binary files a/src/vidalia/res/flags/cy.png and b/src/vidalia/res/flags/cy.png differ diff --git a/src/vidalia/res/flags/cz.png b/src/vidalia/res/flags/cz.png index 69157da..8987b9b 100644 Binary files a/src/vidalia/res/flags/cz.png and b/src/vidalia/res/flags/cz.png differ diff --git a/src/vidalia/res/flags/de.png b/src/vidalia/res/flags/de.png index 3e4fa43..81f5bee 100644 Binary files a/src/vidalia/res/flags/de.png and b/src/vidalia/res/flags/de.png differ diff --git a/src/vidalia/res/flags/dj.png b/src/vidalia/res/flags/dj.png new file mode 100644 index 0000000..331fa26 Binary files /dev/null and b/src/vidalia/res/flags/dj.png differ diff --git a/src/vidalia/res/flags/dk.png b/src/vidalia/res/flags/dk.png index ba86668..61f9343 100644 Binary files a/src/vidalia/res/flags/dk.png and b/src/vidalia/res/flags/dk.png differ diff --git a/src/vidalia/res/flags/dm.png b/src/vidalia/res/flags/dm.png new file mode 100644 index 0000000..794fd52 Binary files /dev/null and b/src/vidalia/res/flags/dm.png differ diff --git a/src/vidalia/res/flags/do.png b/src/vidalia/res/flags/do.png new file mode 100644 index 0000000..78e33fb Binary files /dev/null and b/src/vidalia/res/flags/do.png differ diff --git a/src/vidalia/res/flags/dz.png b/src/vidalia/res/flags/dz.png index fb4e7b9..8c9bf94 100644 Binary files a/src/vidalia/res/flags/dz.png and b/src/vidalia/res/flags/dz.png differ diff --git a/src/vidalia/res/flags/ec.png b/src/vidalia/res/flags/ec.png index 5da356a..4d0e7cf 100644 Binary files a/src/vidalia/res/flags/ec.png and b/src/vidalia/res/flags/ec.png differ diff --git a/src/vidalia/res/flags/ee.png b/src/vidalia/res/flags/ee.png index e5fe7f6..f8c298e 100644 Binary files a/src/vidalia/res/flags/ee.png and b/src/vidalia/res/flags/ee.png differ diff --git a/src/vidalia/res/flags/eg.png b/src/vidalia/res/flags/eg.png index 676be9d..971864e 100644 Binary files a/src/vidalia/res/flags/eg.png and b/src/vidalia/res/flags/eg.png differ diff --git a/src/vidalia/res/flags/eh.png b/src/vidalia/res/flags/eh.png new file mode 100644 index 0000000..98a4d2b Binary files /dev/null and b/src/vidalia/res/flags/eh.png differ diff --git a/src/vidalia/res/flags/er.png b/src/vidalia/res/flags/er.png index 6d34be1..9c73973 100644 Binary files a/src/vidalia/res/flags/er.png and b/src/vidalia/res/flags/er.png differ diff --git a/src/vidalia/res/flags/es.png b/src/vidalia/res/flags/es.png index 6219730..deae319 100644 Binary files a/src/vidalia/res/flags/es.png and b/src/vidalia/res/flags/es.png differ diff --git a/src/vidalia/res/flags/et.png b/src/vidalia/res/flags/et.png index e54a004..3903e54 100644 Binary files a/src/vidalia/res/flags/et.png and b/src/vidalia/res/flags/et.png differ diff --git a/src/vidalia/res/flags/eu.png b/src/vidalia/res/flags/eu.png index aebdae1..ef8669a 100644 Binary files a/src/vidalia/res/flags/eu.png and b/src/vidalia/res/flags/eu.png differ diff --git a/src/vidalia/res/flags/fi.png b/src/vidalia/res/flags/fi.png index d515674..9d05d07 100644 Binary files a/src/vidalia/res/flags/fi.png and b/src/vidalia/res/flags/fi.png differ diff --git a/src/vidalia/res/flags/fj.png b/src/vidalia/res/flags/fj.png index 0b390f4..df0a329 100644 Binary files a/src/vidalia/res/flags/fj.png and b/src/vidalia/res/flags/fj.png differ diff --git a/src/vidalia/res/flags/fk.png b/src/vidalia/res/flags/fk.png new file mode 100644 index 0000000..dd95ec3 Binary files /dev/null and b/src/vidalia/res/flags/fk.png differ diff --git a/src/vidalia/res/flags/fm.png b/src/vidalia/res/flags/fm.png new file mode 100644 index 0000000..114eb4f Binary files /dev/null and b/src/vidalia/res/flags/fm.png differ diff --git a/src/vidalia/res/flags/fo.png b/src/vidalia/res/flags/fo.png index 6e1f438..c42e693 100644 Binary files a/src/vidalia/res/flags/fo.png and b/src/vidalia/res/flags/fo.png differ diff --git a/src/vidalia/res/flags/fr.png b/src/vidalia/res/flags/fr.png index 7102174..f7863ee 100644 Binary files a/src/vidalia/res/flags/fr.png and b/src/vidalia/res/flags/fr.png differ diff --git a/src/vidalia/res/flags/ga.png b/src/vidalia/res/flags/ga.png index d913b2a..6a38e02 100644 Binary files a/src/vidalia/res/flags/ga.png and b/src/vidalia/res/flags/ga.png differ diff --git a/src/vidalia/res/flags/gb.png b/src/vidalia/res/flags/gb.png index a2ad00c..3542857 100644 Binary files a/src/vidalia/res/flags/gb.png and b/src/vidalia/res/flags/gb.png differ diff --git a/src/vidalia/res/flags/gd.png b/src/vidalia/res/flags/gd.png new file mode 100644 index 0000000..8705625 Binary files /dev/null and b/src/vidalia/res/flags/gd.png differ diff --git a/src/vidalia/res/flags/ge.png b/src/vidalia/res/flags/ge.png index bc55add..f0870da 100644 Binary files a/src/vidalia/res/flags/ge.png and b/src/vidalia/res/flags/ge.png differ diff --git a/src/vidalia/res/flags/gf.png b/src/vidalia/res/flags/gf.png new file mode 100644 index 0000000..a88dcef Binary files /dev/null and b/src/vidalia/res/flags/gf.png differ diff --git a/src/vidalia/res/flags/gg.png b/src/vidalia/res/flags/gg.png new file mode 100644 index 0000000..12f12b7 Binary files /dev/null and b/src/vidalia/res/flags/gg.png differ diff --git a/src/vidalia/res/flags/gh.png b/src/vidalia/res/flags/gh.png new file mode 100644 index 0000000..8d60865 Binary files /dev/null and b/src/vidalia/res/flags/gh.png differ diff --git a/src/vidalia/res/flags/gi.png b/src/vidalia/res/flags/gi.png index 82d49a9..14032d6 100644 Binary files a/src/vidalia/res/flags/gi.png and b/src/vidalia/res/flags/gi.png differ diff --git a/src/vidalia/res/flags/gl.png b/src/vidalia/res/flags/gl.png index cba805a..48e4d9e 100644 Binary files a/src/vidalia/res/flags/gl.png and b/src/vidalia/res/flags/gl.png differ diff --git a/src/vidalia/res/flags/gm.png b/src/vidalia/res/flags/gm.png new file mode 100644 index 0000000..3ad65e9 Binary files /dev/null and b/src/vidalia/res/flags/gm.png differ diff --git a/src/vidalia/res/flags/gn.png b/src/vidalia/res/flags/gn.png new file mode 100644 index 0000000..b12383e Binary files /dev/null and b/src/vidalia/res/flags/gn.png differ diff --git a/src/vidalia/res/flags/gp.png b/src/vidalia/res/flags/gp.png index 887316a..742390b 100644 Binary files a/src/vidalia/res/flags/gp.png and b/src/vidalia/res/flags/gp.png differ diff --git a/src/vidalia/res/flags/gq.png b/src/vidalia/res/flags/gq.png new file mode 100644 index 0000000..bd44e93 Binary files /dev/null and b/src/vidalia/res/flags/gq.png differ diff --git a/src/vidalia/res/flags/gr.png b/src/vidalia/res/flags/gr.png index 7803cb4..5fd7010 100644 Binary files a/src/vidalia/res/flags/gr.png and b/src/vidalia/res/flags/gr.png differ diff --git a/src/vidalia/res/flags/gs.png b/src/vidalia/res/flags/gs.png new file mode 100644 index 0000000..e0f8673 Binary files /dev/null and b/src/vidalia/res/flags/gs.png differ diff --git a/src/vidalia/res/flags/gt.png b/src/vidalia/res/flags/gt.png index 31c79c2..3cd36d6 100644 Binary files a/src/vidalia/res/flags/gt.png and b/src/vidalia/res/flags/gt.png differ diff --git a/src/vidalia/res/flags/gu.png b/src/vidalia/res/flags/gu.png index c842809..0a5351c 100644 Binary files a/src/vidalia/res/flags/gu.png and b/src/vidalia/res/flags/gu.png differ diff --git a/src/vidalia/res/flags/gw.png b/src/vidalia/res/flags/gw.png new file mode 100644 index 0000000..e4d6333 Binary files /dev/null and b/src/vidalia/res/flags/gw.png differ diff --git a/src/vidalia/res/flags/gy.png b/src/vidalia/res/flags/gy.png index 8e56db0..48acf0c 100644 Binary files a/src/vidalia/res/flags/gy.png and b/src/vidalia/res/flags/gy.png differ diff --git a/src/vidalia/res/flags/hk.png b/src/vidalia/res/flags/hk.png index fe3e357..1e0c80f 100644 Binary files a/src/vidalia/res/flags/hk.png and b/src/vidalia/res/flags/hk.png differ diff --git a/src/vidalia/res/flags/hm.png b/src/vidalia/res/flags/hm.png new file mode 100644 index 0000000..b6e9ad1 Binary files /dev/null and b/src/vidalia/res/flags/hm.png differ diff --git a/src/vidalia/res/flags/hn.png b/src/vidalia/res/flags/hn.png new file mode 100644 index 0000000..5cd9019 Binary files /dev/null and b/src/vidalia/res/flags/hn.png differ diff --git a/src/vidalia/res/flags/hr.png b/src/vidalia/res/flags/hr.png index c6b8ce7..726a689 100644 Binary files a/src/vidalia/res/flags/hr.png and b/src/vidalia/res/flags/hr.png differ diff --git a/src/vidalia/res/flags/ht.png b/src/vidalia/res/flags/ht.png index 5b67b34..a5962fa 100644 Binary files a/src/vidalia/res/flags/ht.png and b/src/vidalia/res/flags/ht.png differ diff --git a/src/vidalia/res/flags/hu.png b/src/vidalia/res/flags/hu.png index 9eac7cf..df2ff03 100644 Binary files a/src/vidalia/res/flags/hu.png and b/src/vidalia/res/flags/hu.png differ diff --git a/src/vidalia/res/flags/id.png b/src/vidalia/res/flags/id.png index 57de136..02c9b3b 100644 Binary files a/src/vidalia/res/flags/id.png and b/src/vidalia/res/flags/id.png differ diff --git a/src/vidalia/res/flags/ie.png b/src/vidalia/res/flags/ie.png index 692c6b0..db98844 100644 Binary files a/src/vidalia/res/flags/ie.png and b/src/vidalia/res/flags/ie.png differ diff --git a/src/vidalia/res/flags/il.png b/src/vidalia/res/flags/il.png index 8acc027..64f4669 100644 Binary files a/src/vidalia/res/flags/il.png and b/src/vidalia/res/flags/il.png differ diff --git a/src/vidalia/res/flags/im.png b/src/vidalia/res/flags/im.png new file mode 100644 index 0000000..867db64 Binary files /dev/null and b/src/vidalia/res/flags/im.png differ diff --git a/src/vidalia/res/flags/in.png b/src/vidalia/res/flags/in.png index 9b7dc40..d0bba11 100644 Binary files a/src/vidalia/res/flags/in.png and b/src/vidalia/res/flags/in.png differ diff --git a/src/vidalia/res/flags/io.png b/src/vidalia/res/flags/io.png new file mode 100644 index 0000000..b36a84f Binary files /dev/null and b/src/vidalia/res/flags/io.png differ diff --git a/src/vidalia/res/flags/iq.png b/src/vidalia/res/flags/iq.png index 131af96..116593d 100644 Binary files a/src/vidalia/res/flags/iq.png and b/src/vidalia/res/flags/iq.png differ diff --git a/src/vidalia/res/flags/ir.png b/src/vidalia/res/flags/ir.png index 4495d84..656dc83 100644 Binary files a/src/vidalia/res/flags/ir.png and b/src/vidalia/res/flags/ir.png differ diff --git a/src/vidalia/res/flags/is.png b/src/vidalia/res/flags/is.png index a8cd1d4..3439561 100644 Binary files a/src/vidalia/res/flags/is.png and b/src/vidalia/res/flags/is.png differ diff --git a/src/vidalia/res/flags/it.png b/src/vidalia/res/flags/it.png index 0d68791..5d0c801 100644 Binary files a/src/vidalia/res/flags/it.png and b/src/vidalia/res/flags/it.png differ diff --git a/src/vidalia/res/flags/je.png b/src/vidalia/res/flags/je.png new file mode 100644 index 0000000..7bfcc42 Binary files /dev/null and b/src/vidalia/res/flags/je.png differ diff --git a/src/vidalia/res/flags/jm.png b/src/vidalia/res/flags/jm.png index 2e3db29..86a3f4b 100644 Binary files a/src/vidalia/res/flags/jm.png and b/src/vidalia/res/flags/jm.png differ diff --git a/src/vidalia/res/flags/jo.png b/src/vidalia/res/flags/jo.png index 8f1270d..103344d 100644 Binary files a/src/vidalia/res/flags/jo.png and b/src/vidalia/res/flags/jo.png differ diff --git a/src/vidalia/res/flags/jp.png b/src/vidalia/res/flags/jp.png index b656389..5026d41 100644 Binary files a/src/vidalia/res/flags/jp.png and b/src/vidalia/res/flags/jp.png differ diff --git a/src/vidalia/res/flags/ke.png b/src/vidalia/res/flags/ke.png index 69f742b..c818bd4 100644 Binary files a/src/vidalia/res/flags/ke.png and b/src/vidalia/res/flags/ke.png differ diff --git a/src/vidalia/res/flags/kg.png b/src/vidalia/res/flags/kg.png index c455107..7619f35 100644 Binary files a/src/vidalia/res/flags/kg.png and b/src/vidalia/res/flags/kg.png differ diff --git a/src/vidalia/res/flags/kh.png b/src/vidalia/res/flags/kh.png index b80b8c4..e842e45 100644 Binary files a/src/vidalia/res/flags/kh.png and b/src/vidalia/res/flags/kh.png differ diff --git a/src/vidalia/res/flags/ki.png b/src/vidalia/res/flags/ki.png index a3eac22..294d1ea 100644 Binary files a/src/vidalia/res/flags/ki.png and b/src/vidalia/res/flags/ki.png differ diff --git a/src/vidalia/res/flags/km.png b/src/vidalia/res/flags/km.png new file mode 100644 index 0000000..8c8cf19 Binary files /dev/null and b/src/vidalia/res/flags/km.png differ diff --git a/src/vidalia/res/flags/kn.png b/src/vidalia/res/flags/kn.png new file mode 100644 index 0000000..e573100 Binary files /dev/null and b/src/vidalia/res/flags/kn.png differ diff --git a/src/vidalia/res/flags/kp.png b/src/vidalia/res/flags/kp.png index 7bce15c..6f0f496 100644 Binary files a/src/vidalia/res/flags/kp.png and b/src/vidalia/res/flags/kp.png differ diff --git a/src/vidalia/res/flags/kr.png b/src/vidalia/res/flags/kr.png index e2edef5..3fa3026 100644 Binary files a/src/vidalia/res/flags/kr.png and b/src/vidalia/res/flags/kr.png differ diff --git a/src/vidalia/res/flags/kw.png b/src/vidalia/res/flags/kw.png index 8654623..83e4c3f 100644 Binary files a/src/vidalia/res/flags/kw.png and b/src/vidalia/res/flags/kw.png differ diff --git a/src/vidalia/res/flags/ky.png b/src/vidalia/res/flags/ky.png index d7f8a81..0816456 100644 Binary files a/src/vidalia/res/flags/ky.png and b/src/vidalia/res/flags/ky.png differ diff --git a/src/vidalia/res/flags/kz.png b/src/vidalia/res/flags/kz.png index aab3cfb..c81803f 100644 Binary files a/src/vidalia/res/flags/kz.png and b/src/vidalia/res/flags/kz.png differ diff --git a/src/vidalia/res/flags/la.png b/src/vidalia/res/flags/la.png new file mode 100644 index 0000000..6ce46b8 Binary files /dev/null and b/src/vidalia/res/flags/la.png differ diff --git a/src/vidalia/res/flags/lb.png b/src/vidalia/res/flags/lb.png index c20823c..684dd59 100644 Binary files a/src/vidalia/res/flags/lb.png and b/src/vidalia/res/flags/lb.png differ diff --git a/src/vidalia/res/flags/lc.png b/src/vidalia/res/flags/lc.png index ba202aa..0b7c709 100644 Binary files a/src/vidalia/res/flags/lc.png and b/src/vidalia/res/flags/lc.png differ diff --git a/src/vidalia/res/flags/li.png b/src/vidalia/res/flags/li.png new file mode 100644 index 0000000..7236eea Binary files /dev/null and b/src/vidalia/res/flags/li.png differ diff --git a/src/vidalia/res/flags/lk.png b/src/vidalia/res/flags/lk.png index e8610a0..5e6e23a 100644 Binary files a/src/vidalia/res/flags/lk.png and b/src/vidalia/res/flags/lk.png differ diff --git a/src/vidalia/res/flags/lr.png b/src/vidalia/res/flags/lr.png new file mode 100644 index 0000000..cc76a79 Binary files /dev/null and b/src/vidalia/res/flags/lr.png differ diff --git a/src/vidalia/res/flags/ls.png b/src/vidalia/res/flags/ls.png new file mode 100644 index 0000000..06c5636 Binary files /dev/null and b/src/vidalia/res/flags/ls.png differ diff --git a/src/vidalia/res/flags/lt.png b/src/vidalia/res/flags/lt.png index 553b510..b362877 100644 Binary files a/src/vidalia/res/flags/lt.png and b/src/vidalia/res/flags/lt.png differ diff --git a/src/vidalia/res/flags/lu.png b/src/vidalia/res/flags/lu.png index ca3c4e4..eb9e46a 100644 Binary files a/src/vidalia/res/flags/lu.png and b/src/vidalia/res/flags/lu.png differ diff --git a/src/vidalia/res/flags/lv.png b/src/vidalia/res/flags/lv.png index 3f250a6..e675f31 100644 Binary files a/src/vidalia/res/flags/lv.png and b/src/vidalia/res/flags/lv.png differ diff --git a/src/vidalia/res/flags/ly.png b/src/vidalia/res/flags/ly.png index 1bf8ede..d7b0beb 100644 Binary files a/src/vidalia/res/flags/ly.png and b/src/vidalia/res/flags/ly.png differ diff --git a/src/vidalia/res/flags/ma.png b/src/vidalia/res/flags/ma.png index d98045e..a77731c 100644 Binary files a/src/vidalia/res/flags/ma.png and b/src/vidalia/res/flags/ma.png differ diff --git a/src/vidalia/res/flags/mc.png b/src/vidalia/res/flags/mc.png index d398b4a..02c9b3b 100644 Binary files a/src/vidalia/res/flags/mc.png and b/src/vidalia/res/flags/mc.png differ diff --git a/src/vidalia/res/flags/md.png b/src/vidalia/res/flags/md.png index 81c6d19..d7cb653 100644 Binary files a/src/vidalia/res/flags/md.png and b/src/vidalia/res/flags/md.png differ diff --git a/src/vidalia/res/flags/me.png b/src/vidalia/res/flags/me.png new file mode 100644 index 0000000..5abbdbb Binary files /dev/null and b/src/vidalia/res/flags/me.png differ diff --git a/src/vidalia/res/flags/mf.png b/src/vidalia/res/flags/mf.png new file mode 100644 index 0000000..b7af15a Binary files /dev/null and b/src/vidalia/res/flags/mf.png differ diff --git a/src/vidalia/res/flags/mg.png b/src/vidalia/res/flags/mg.png index 67753ea..e670827 100644 Binary files a/src/vidalia/res/flags/mg.png and b/src/vidalia/res/flags/mg.png differ diff --git a/src/vidalia/res/flags/mh.png b/src/vidalia/res/flags/mh.png new file mode 100644 index 0000000..fc68177 Binary files /dev/null and b/src/vidalia/res/flags/mh.png differ diff --git a/src/vidalia/res/flags/mk.png b/src/vidalia/res/flags/mk.png index 0de419c..49ae623 100644 Binary files a/src/vidalia/res/flags/mk.png and b/src/vidalia/res/flags/mk.png differ diff --git a/src/vidalia/res/flags/ml.png b/src/vidalia/res/flags/ml.png new file mode 100644 index 0000000..20d776b Binary files /dev/null and b/src/vidalia/res/flags/ml.png differ diff --git a/src/vidalia/res/flags/mm.png b/src/vidalia/res/flags/mm.png new file mode 100644 index 0000000..c10ec90 Binary files /dev/null and b/src/vidalia/res/flags/mm.png differ diff --git a/src/vidalia/res/flags/mn.png b/src/vidalia/res/flags/mn.png index 917fd18..3a5bcac 100644 Binary files a/src/vidalia/res/flags/mn.png and b/src/vidalia/res/flags/mn.png differ diff --git a/src/vidalia/res/flags/mo.png b/src/vidalia/res/flags/mo.png index b51ede3..46f4562 100644 Binary files a/src/vidalia/res/flags/mo.png and b/src/vidalia/res/flags/mo.png differ diff --git a/src/vidalia/res/flags/mp.png b/src/vidalia/res/flags/mp.png index 8260b90..2eba39d 100644 Binary files a/src/vidalia/res/flags/mp.png and b/src/vidalia/res/flags/mp.png differ diff --git a/src/vidalia/res/flags/mq.png b/src/vidalia/res/flags/mq.png new file mode 100644 index 0000000..ae4df57 Binary files /dev/null and b/src/vidalia/res/flags/mq.png differ diff --git a/src/vidalia/res/flags/mr.png b/src/vidalia/res/flags/mr.png new file mode 100644 index 0000000..39c729a Binary files /dev/null and b/src/vidalia/res/flags/mr.png differ diff --git a/src/vidalia/res/flags/ms.png b/src/vidalia/res/flags/ms.png index 77e0d1b..b27335c 100644 Binary files a/src/vidalia/res/flags/ms.png and b/src/vidalia/res/flags/ms.png differ diff --git a/src/vidalia/res/flags/mt.png b/src/vidalia/res/flags/mt.png index e0b456f..8ce3af3 100644 Binary files a/src/vidalia/res/flags/mt.png and b/src/vidalia/res/flags/mt.png differ diff --git a/src/vidalia/res/flags/mu.png b/src/vidalia/res/flags/mu.png new file mode 100644 index 0000000..e9d8808 Binary files /dev/null and b/src/vidalia/res/flags/mu.png differ diff --git a/src/vidalia/res/flags/mv.png b/src/vidalia/res/flags/mv.png new file mode 100644 index 0000000..a1bcb64 Binary files /dev/null and b/src/vidalia/res/flags/mv.png differ diff --git a/src/vidalia/res/flags/mw.png b/src/vidalia/res/flags/mw.png new file mode 100644 index 0000000..c6e0626 Binary files /dev/null and b/src/vidalia/res/flags/mw.png differ diff --git a/src/vidalia/res/flags/mx.png b/src/vidalia/res/flags/mx.png index 67db550..04317c2 100644 Binary files a/src/vidalia/res/flags/mx.png and b/src/vidalia/res/flags/mx.png differ diff --git a/src/vidalia/res/flags/my.png b/src/vidalia/res/flags/my.png index c95ae6f..5d07170 100644 Binary files a/src/vidalia/res/flags/my.png and b/src/vidalia/res/flags/my.png differ diff --git a/src/vidalia/res/flags/mz.png b/src/vidalia/res/flags/mz.png index 3ec9414..c5c2dd6 100644 Binary files a/src/vidalia/res/flags/mz.png and b/src/vidalia/res/flags/mz.png differ diff --git a/src/vidalia/res/flags/na.png b/src/vidalia/res/flags/na.png index f87051b..3b90654 100644 Binary files a/src/vidalia/res/flags/na.png and b/src/vidalia/res/flags/na.png differ diff --git a/src/vidalia/res/flags/nc.png b/src/vidalia/res/flags/nc.png index ddd33f3..10efee8 100644 Binary files a/src/vidalia/res/flags/nc.png and b/src/vidalia/res/flags/nc.png differ diff --git a/src/vidalia/res/flags/ne.png b/src/vidalia/res/flags/ne.png new file mode 100644 index 0000000..3fe9546 Binary files /dev/null and b/src/vidalia/res/flags/ne.png differ diff --git a/src/vidalia/res/flags/nf.png b/src/vidalia/res/flags/nf.png index 2b7d702..f992e88 100644 Binary files a/src/vidalia/res/flags/nf.png and b/src/vidalia/res/flags/nf.png differ diff --git a/src/vidalia/res/flags/ng.png b/src/vidalia/res/flags/ng.png new file mode 100644 index 0000000..e95039f Binary files /dev/null and b/src/vidalia/res/flags/ng.png differ diff --git a/src/vidalia/res/flags/ni.png b/src/vidalia/res/flags/ni.png new file mode 100644 index 0000000..ae70194 Binary files /dev/null and b/src/vidalia/res/flags/ni.png differ diff --git a/src/vidalia/res/flags/nl.png b/src/vidalia/res/flags/nl.png index 3542a57..4736b63 100644 Binary files a/src/vidalia/res/flags/nl.png and b/src/vidalia/res/flags/nl.png differ diff --git a/src/vidalia/res/flags/no.png b/src/vidalia/res/flags/no.png index ededb0d..b773600 100644 Binary files a/src/vidalia/res/flags/no.png and b/src/vidalia/res/flags/no.png differ diff --git a/src/vidalia/res/flags/np.png b/src/vidalia/res/flags/np.png index d98045e..42ba009 100644 Binary files a/src/vidalia/res/flags/np.png and b/src/vidalia/res/flags/np.png differ diff --git a/src/vidalia/res/flags/nr.png b/src/vidalia/res/flags/nr.png index 642b2f6..928ab92 100644 Binary files a/src/vidalia/res/flags/nr.png and b/src/vidalia/res/flags/nr.png differ diff --git a/src/vidalia/res/flags/nu.png b/src/vidalia/res/flags/nu.png new file mode 100644 index 0000000..0e2abf0 Binary files /dev/null and b/src/vidalia/res/flags/nu.png differ diff --git a/src/vidalia/res/flags/nz.png b/src/vidalia/res/flags/nz.png index c5a5c9f..5245e27 100644 Binary files a/src/vidalia/res/flags/nz.png and b/src/vidalia/res/flags/nz.png differ diff --git a/src/vidalia/res/flags/om.png b/src/vidalia/res/flags/om.png index 814c1d9..357062c 100644 Binary files a/src/vidalia/res/flags/om.png and b/src/vidalia/res/flags/om.png differ diff --git a/src/vidalia/res/flags/pa.png b/src/vidalia/res/flags/pa.png index fd99701..5a9f3d4 100644 Binary files a/src/vidalia/res/flags/pa.png and b/src/vidalia/res/flags/pa.png differ diff --git a/src/vidalia/res/flags/pe.png b/src/vidalia/res/flags/pe.png index ac0b03f..29054b4 100644 Binary files a/src/vidalia/res/flags/pe.png and b/src/vidalia/res/flags/pe.png differ diff --git a/src/vidalia/res/flags/pf.png b/src/vidalia/res/flags/pf.png index 11434d0..ebe3418 100644 Binary files a/src/vidalia/res/flags/pf.png and b/src/vidalia/res/flags/pf.png differ diff --git a/src/vidalia/res/flags/pg.png b/src/vidalia/res/flags/pg.png new file mode 100644 index 0000000..d9da2d2 Binary files /dev/null and b/src/vidalia/res/flags/pg.png differ diff --git a/src/vidalia/res/flags/ph.png b/src/vidalia/res/flags/ph.png index a5b331f..d8a21db 100644 Binary files a/src/vidalia/res/flags/ph.png and b/src/vidalia/res/flags/ph.png differ diff --git a/src/vidalia/res/flags/pk.png b/src/vidalia/res/flags/pk.png index 922ab5d..0ca0e54 100644 Binary files a/src/vidalia/res/flags/pk.png and b/src/vidalia/res/flags/pk.png differ diff --git a/src/vidalia/res/flags/pl.png b/src/vidalia/res/flags/pl.png index 8f89576..10a7b8f 100644 Binary files a/src/vidalia/res/flags/pl.png and b/src/vidalia/res/flags/pl.png differ diff --git a/src/vidalia/res/flags/pm.png b/src/vidalia/res/flags/pm.png index 9ce2d60..8a06ab8 100644 Binary files a/src/vidalia/res/flags/pm.png and b/src/vidalia/res/flags/pm.png differ diff --git a/src/vidalia/res/flags/pn.png b/src/vidalia/res/flags/pn.png new file mode 100644 index 0000000..1df26af Binary files /dev/null and b/src/vidalia/res/flags/pn.png differ diff --git a/src/vidalia/res/flags/pr.png b/src/vidalia/res/flags/pr.png index 98c28b9..dec21e9 100644 Binary files a/src/vidalia/res/flags/pr.png and b/src/vidalia/res/flags/pr.png differ diff --git a/src/vidalia/res/flags/ps.png b/src/vidalia/res/flags/ps.png new file mode 100644 index 0000000..605746c Binary files /dev/null and b/src/vidalia/res/flags/ps.png differ diff --git a/src/vidalia/res/flags/pt.png b/src/vidalia/res/flags/pt.png index 9d3aa9b..874a756 100644 Binary files a/src/vidalia/res/flags/pt.png and b/src/vidalia/res/flags/pt.png differ diff --git a/src/vidalia/res/flags/pw.png b/src/vidalia/res/flags/pw.png new file mode 100644 index 0000000..d4bfb51 Binary files /dev/null and b/src/vidalia/res/flags/pw.png differ diff --git a/src/vidalia/res/flags/py.png b/src/vidalia/res/flags/py.png index b43dfc2..a7968c0 100644 Binary files a/src/vidalia/res/flags/py.png and b/src/vidalia/res/flags/py.png differ diff --git a/src/vidalia/res/flags/qa.png b/src/vidalia/res/flags/qa.png index 327c604..5a2ef3d 100644 Binary files a/src/vidalia/res/flags/qa.png and b/src/vidalia/res/flags/qa.png differ diff --git a/src/vidalia/res/flags/re.png b/src/vidalia/res/flags/re.png new file mode 100644 index 0000000..4613b15 Binary files /dev/null and b/src/vidalia/res/flags/re.png differ diff --git a/src/vidalia/res/flags/ro.png b/src/vidalia/res/flags/ro.png index ef0d190..20087fd 100644 Binary files a/src/vidalia/res/flags/ro.png and b/src/vidalia/res/flags/ro.png differ diff --git a/src/vidalia/res/flags/rs.png b/src/vidalia/res/flags/rs.png new file mode 100644 index 0000000..4db8055 Binary files /dev/null and b/src/vidalia/res/flags/rs.png differ diff --git a/src/vidalia/res/flags/ru.png b/src/vidalia/res/flags/ru.png index d0ce881..2d750f8 100644 Binary files a/src/vidalia/res/flags/ru.png and b/src/vidalia/res/flags/ru.png differ diff --git a/src/vidalia/res/flags/rw.png b/src/vidalia/res/flags/rw.png new file mode 100644 index 0000000..1bdaa5b Binary files /dev/null and b/src/vidalia/res/flags/rw.png differ diff --git a/src/vidalia/res/flags/sa.png b/src/vidalia/res/flags/sa.png index f30f75e..4abe18a 100644 Binary files a/src/vidalia/res/flags/sa.png and b/src/vidalia/res/flags/sa.png differ diff --git a/src/vidalia/res/flags/sb.png b/src/vidalia/res/flags/sb.png index ce219d1..3cbb73b 100644 Binary files a/src/vidalia/res/flags/sb.png and b/src/vidalia/res/flags/sb.png differ diff --git a/src/vidalia/res/flags/sc.png b/src/vidalia/res/flags/sc.png new file mode 100644 index 0000000..bc34a02 Binary files /dev/null and b/src/vidalia/res/flags/sc.png differ diff --git a/src/vidalia/res/flags/sd.png b/src/vidalia/res/flags/sd.png index 01a54cb..d9d6e5c 100644 Binary files a/src/vidalia/res/flags/sd.png and b/src/vidalia/res/flags/sd.png differ diff --git a/src/vidalia/res/flags/se.png b/src/vidalia/res/flags/se.png index 463382f..a26499b 100644 Binary files a/src/vidalia/res/flags/se.png and b/src/vidalia/res/flags/se.png differ diff --git a/src/vidalia/res/flags/sg.png b/src/vidalia/res/flags/sg.png index ef5a448..83beb94 100644 Binary files a/src/vidalia/res/flags/sg.png and b/src/vidalia/res/flags/sg.png differ diff --git a/src/vidalia/res/flags/sh.png b/src/vidalia/res/flags/sh.png new file mode 100644 index 0000000..8d3bf23 Binary files /dev/null and b/src/vidalia/res/flags/sh.png differ diff --git a/src/vidalia/res/flags/si.png b/src/vidalia/res/flags/si.png index 3f1c159..50be6af 100644 Binary files a/src/vidalia/res/flags/si.png and b/src/vidalia/res/flags/si.png differ diff --git a/src/vidalia/res/flags/sj.png b/src/vidalia/res/flags/sj.png new file mode 100644 index 0000000..b773600 Binary files /dev/null and b/src/vidalia/res/flags/sj.png differ diff --git a/src/vidalia/res/flags/sk.png b/src/vidalia/res/flags/sk.png index 6f1bc96..e864fa2 100644 Binary files a/src/vidalia/res/flags/sk.png and b/src/vidalia/res/flags/sk.png differ diff --git a/src/vidalia/res/flags/sl.png b/src/vidalia/res/flags/sl.png index 4daf7d4..c5ab8a5 100644 Binary files a/src/vidalia/res/flags/sl.png and b/src/vidalia/res/flags/sl.png differ diff --git a/src/vidalia/res/flags/sm.png b/src/vidalia/res/flags/sm.png index d3c3691..28caa09 100644 Binary files a/src/vidalia/res/flags/sm.png and b/src/vidalia/res/flags/sm.png differ diff --git a/src/vidalia/res/flags/sn.png b/src/vidalia/res/flags/sn.png new file mode 100644 index 0000000..7792b03 Binary files /dev/null and b/src/vidalia/res/flags/sn.png differ diff --git a/src/vidalia/res/flags/so.png b/src/vidalia/res/flags/so.png index 175d407..4d05e52 100644 Binary files a/src/vidalia/res/flags/so.png and b/src/vidalia/res/flags/so.png differ diff --git a/src/vidalia/res/flags/sr.png b/src/vidalia/res/flags/sr.png new file mode 100644 index 0000000..2159e01 Binary files /dev/null and b/src/vidalia/res/flags/sr.png differ diff --git a/src/vidalia/res/flags/st.png b/src/vidalia/res/flags/st.png new file mode 100644 index 0000000..1bccc1a Binary files /dev/null and b/src/vidalia/res/flags/st.png differ diff --git a/src/vidalia/res/flags/sv.png b/src/vidalia/res/flags/sv.png new file mode 100644 index 0000000..7722f4b Binary files /dev/null and b/src/vidalia/res/flags/sv.png differ diff --git a/src/vidalia/res/flags/sy.png b/src/vidalia/res/flags/sy.png index d98045e..a12fa21 100644 Binary files a/src/vidalia/res/flags/sy.png and b/src/vidalia/res/flags/sy.png differ diff --git a/src/vidalia/res/flags/sz.png b/src/vidalia/res/flags/sz.png new file mode 100644 index 0000000..aca0675 Binary files /dev/null and b/src/vidalia/res/flags/sz.png differ diff --git a/src/vidalia/res/flags/tc.png b/src/vidalia/res/flags/tc.png index 56dff7a..cbdb899 100644 Binary files a/src/vidalia/res/flags/tc.png and b/src/vidalia/res/flags/tc.png differ diff --git a/src/vidalia/res/flags/td.png b/src/vidalia/res/flags/td.png new file mode 100644 index 0000000..3edd20b Binary files /dev/null and b/src/vidalia/res/flags/td.png differ diff --git a/src/vidalia/res/flags/tf.png b/src/vidalia/res/flags/tf.png new file mode 100644 index 0000000..e2bb58d Binary files /dev/null and b/src/vidalia/res/flags/tf.png differ diff --git a/src/vidalia/res/flags/tg.png b/src/vidalia/res/flags/tg.png index 19a8da2..c49c466 100644 Binary files a/src/vidalia/res/flags/tg.png and b/src/vidalia/res/flags/tg.png differ diff --git a/src/vidalia/res/flags/th.png b/src/vidalia/res/flags/th.png index ac82f5f..1d888f9 100644 Binary files a/src/vidalia/res/flags/th.png and b/src/vidalia/res/flags/th.png differ diff --git a/src/vidalia/res/flags/tj.png b/src/vidalia/res/flags/tj.png new file mode 100644 index 0000000..e063d43 Binary files /dev/null and b/src/vidalia/res/flags/tj.png differ diff --git a/src/vidalia/res/flags/tk.png b/src/vidalia/res/flags/tk.png new file mode 100644 index 0000000..9787413 Binary files /dev/null and b/src/vidalia/res/flags/tk.png differ diff --git a/src/vidalia/res/flags/tl.png b/src/vidalia/res/flags/tl.png new file mode 100644 index 0000000..a008b7e Binary files /dev/null and b/src/vidalia/res/flags/tl.png differ diff --git a/src/vidalia/res/flags/tm.png b/src/vidalia/res/flags/tm.png new file mode 100644 index 0000000..4089f2e Binary files /dev/null and b/src/vidalia/res/flags/tm.png differ diff --git a/src/vidalia/res/flags/tn.png b/src/vidalia/res/flags/tn.png index c03002c..166cec2 100644 Binary files a/src/vidalia/res/flags/tn.png and b/src/vidalia/res/flags/tn.png differ diff --git a/src/vidalia/res/flags/to.png b/src/vidalia/res/flags/to.png index be306fc..a9fd505 100644 Binary files a/src/vidalia/res/flags/to.png and b/src/vidalia/res/flags/to.png differ diff --git a/src/vidalia/res/flags/tr.png b/src/vidalia/res/flags/tr.png index f799e03..c10cdbd 100644 Binary files a/src/vidalia/res/flags/tr.png and b/src/vidalia/res/flags/tr.png differ diff --git a/src/vidalia/res/flags/tt.png b/src/vidalia/res/flags/tt.png index b6fddae..59c6566 100644 Binary files a/src/vidalia/res/flags/tt.png and b/src/vidalia/res/flags/tt.png differ diff --git a/src/vidalia/res/flags/tv.png b/src/vidalia/res/flags/tv.png index df60d61..06d4c0d 100644 Binary files a/src/vidalia/res/flags/tv.png and b/src/vidalia/res/flags/tv.png differ diff --git a/src/vidalia/res/flags/tw.png b/src/vidalia/res/flags/tw.png index 27de646..df42200 100644 Binary files a/src/vidalia/res/flags/tw.png and b/src/vidalia/res/flags/tw.png differ diff --git a/src/vidalia/res/flags/tz.png b/src/vidalia/res/flags/tz.png index 12832d6..ed9b3e2 100644 Binary files a/src/vidalia/res/flags/tz.png and b/src/vidalia/res/flags/tz.png differ diff --git a/src/vidalia/res/flags/ua.png b/src/vidalia/res/flags/ua.png index 9b560a3..c8fc5ab 100644 Binary files a/src/vidalia/res/flags/ua.png and b/src/vidalia/res/flags/ua.png differ diff --git a/src/vidalia/res/flags/ug.png b/src/vidalia/res/flags/ug.png index f01a8a8..4fae0ca 100644 Binary files a/src/vidalia/res/flags/ug.png and b/src/vidalia/res/flags/ug.png differ diff --git a/src/vidalia/res/flags/um.png b/src/vidalia/res/flags/um.png new file mode 100644 index 0000000..022aeeb Binary files /dev/null and b/src/vidalia/res/flags/um.png differ diff --git a/src/vidalia/res/flags/us.png b/src/vidalia/res/flags/us.png index e203915..022aeeb 100644 Binary files a/src/vidalia/res/flags/us.png and b/src/vidalia/res/flags/us.png differ diff --git a/src/vidalia/res/flags/uy.png b/src/vidalia/res/flags/uy.png index 580f53e..6701b26 100644 Binary files a/src/vidalia/res/flags/uy.png and b/src/vidalia/res/flags/uy.png differ diff --git a/src/vidalia/res/flags/uz.png b/src/vidalia/res/flags/uz.png new file mode 100644 index 0000000..107ddc4 Binary files /dev/null and b/src/vidalia/res/flags/uz.png differ diff --git a/src/vidalia/res/flags/va.png b/src/vidalia/res/flags/va.png index 1517d77..6f6e033 100644 Binary files a/src/vidalia/res/flags/va.png and b/src/vidalia/res/flags/va.png differ diff --git a/src/vidalia/res/flags/vc.png b/src/vidalia/res/flags/vc.png new file mode 100644 index 0000000..1e0e20d Binary files /dev/null and b/src/vidalia/res/flags/vc.png differ diff --git a/src/vidalia/res/flags/ve.png b/src/vidalia/res/flags/ve.png index 35a1b81..6f8a61e 100644 Binary files a/src/vidalia/res/flags/ve.png and b/src/vidalia/res/flags/ve.png differ diff --git a/src/vidalia/res/flags/vg.png b/src/vidalia/res/flags/vg.png index c841cbc..8c8a132 100644 Binary files a/src/vidalia/res/flags/vg.png and b/src/vidalia/res/flags/vg.png differ diff --git a/src/vidalia/res/flags/vi.png b/src/vidalia/res/flags/vi.png index 6152a6b..db4b526 100644 Binary files a/src/vidalia/res/flags/vi.png and b/src/vidalia/res/flags/vi.png differ diff --git a/src/vidalia/res/flags/vn.png b/src/vidalia/res/flags/vn.png index 175b652..4dde3d7 100644 Binary files a/src/vidalia/res/flags/vn.png and b/src/vidalia/res/flags/vn.png differ diff --git a/src/vidalia/res/flags/vu.png b/src/vidalia/res/flags/vu.png new file mode 100644 index 0000000..ca83105 Binary files /dev/null and b/src/vidalia/res/flags/vu.png differ diff --git a/src/vidalia/res/flags/wf.png b/src/vidalia/res/flags/wf.png new file mode 100644 index 0000000..1149100 Binary files /dev/null and b/src/vidalia/res/flags/wf.png differ diff --git a/src/vidalia/res/flags/ws.png b/src/vidalia/res/flags/ws.png index a912d36..ed9ea0e 100644 Binary files a/src/vidalia/res/flags/ws.png and b/src/vidalia/res/flags/ws.png differ diff --git a/src/vidalia/res/flags/ye.png b/src/vidalia/res/flags/ye.png index deab0e6..dcaa423 100644 Binary files a/src/vidalia/res/flags/ye.png and b/src/vidalia/res/flags/ye.png differ diff --git a/src/vidalia/res/flags/yt.png b/src/vidalia/res/flags/yt.png new file mode 100644 index 0000000..e81c622 Binary files /dev/null and b/src/vidalia/res/flags/yt.png differ diff --git a/src/vidalia/res/flags/za.png b/src/vidalia/res/flags/za.png index 3d07dbb..3f89499 100644 Binary files a/src/vidalia/res/flags/za.png and b/src/vidalia/res/flags/za.png differ diff --git a/src/vidalia/res/flags/zm.png b/src/vidalia/res/flags/zm.png new file mode 100644 index 0000000..f9e386f Binary files /dev/null and b/src/vidalia/res/flags/zm.png differ diff --git a/src/vidalia/res/flags/zw.png b/src/vidalia/res/flags/zw.png index b1bf791..262e16e 100644 Binary files a/src/vidalia/res/flags/zw.png and b/src/vidalia/res/flags/zw.png differ

1 0

[torspec/master] proposal 203: Avoiding censorship by impersonating an HTTPS server
by nickm＠torproject.org 25 Jun '12

25 Jun '12

commit d3aa362f6e507031931ef1815512f4eefe3d2fb2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 25 18:20:11 2012 -0400 proposal 203: Avoiding censorship by impersonating an HTTPS server --- proposals/000-index.txt | 2 + proposals/203-https-frontend.txt | 247 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 249 insertions(+), 0 deletions(-) diff --git a/proposals/000-index.txt b/proposals/000-index.txt index c4a2ef9..f7b546e 100644 --- a/proposals/000-index.txt +++ b/proposals/000-index.txt @@ -123,6 +123,7 @@ Proposals by number: 200 Adding new, extensible CREATE, EXTEND, and related cells [OPEN] 201 Make bridges report statistics on daily v3 network status requests [OPEN] 202 Two improved relay encryption protocols for Tor cells [OPEN] +203 Avoiding censorship by impersonating an HTTPS server [DRAFT] Proposals by status: @@ -136,6 +137,7 @@ Proposals by status: 175 Automatically promoting Tor clients to nodes 182 Credit Bucket 195 TLS certificate normalization for Tor 0.2.4.x [for 0.2.4.x] + 203 Avoiding censorship by impersonating an HTTPS server NEEDS-REVISION: 131 Help users to verify they are using Tor 190 Bridge Client Authorization Based on a Shared Secret diff --git a/proposals/203-https-frontend.txt b/proposals/203-https-frontend.txt new file mode 100644 index 0000000..f559d92 --- /dev/null +++ b/proposals/203-https-frontend.txt @@ -0,0 +1,247 @@ +Filename: 203-https-frontend.txt +Title: Avoiding censorship by impersonating an HTTPS server +Author: Nick Mathewson +Created: 24 Jun 2012 +Status: Draft + + +Overview: + + One frequently proposed approach for censorship resistance is that + Tor bridges ought to act like another TLS-based service, and deliver + traffic to Tor only if the client can demonstrate some shared + knowledge with the bridge. + + In this document, I discuss some design considerations for building + such systems, and propose a few possible architectures and designs. + +Background: + + Most of our previous work on censorship resistance has focused on + preventing passive attackers from identifying Tor bridges, or from + doing so cheaply. But active attackers exist, and exist in the wild: + right now, the most sophisticated censors use their anti-Tor passive + attacks only as a first round of filtering before launching a + secondary active attack to confirm suspected Tor nodes. + + One idea we've been talking about for a while is that of having a + service that looks like an HTTPS service unless a client does some + particular secret thing to prove it is allowed to use it as a Tor + bridge. Such a system would still succumb to passive traffic + analysis attacks (since the packet timings and sizes for HTTPS don't + look that much like Tor), but it would be enough to beat many current + censors. + +Goals and requirements: + + We should make it impossible for a passive attacker who examines only + a few packets at a time to distinguish Tor->Bridge traffic from an + HTTPS client talking to an HTTPS server. + + We should make it impossible for an active attacker talking to the + server to tell a Tor bridge server from regular HTTPS server. + + We should make it impossible for an active attacker who can MITM the + server to learn from the client whether it thought it was connecting + to an HTTPS server or a Tor bridge. (This implies that an MITM + attacker shouldn't be able to learn anything that would help it + convince the server to act like a bridge.) + + It would be nice to minimize the required code changes to Tor, and + the required code changes to any other software. + + It would be good to avoid any requirement of close integration with + any particular HTTP or HTTPS implementation. + + If we're replacing our own profile with that of an HTTPS service, we + should do so in a way that lets us use a the profile of a popular + HTTPS implementation. + + Efficiency would be good: layering TLS inside TLS is best avoided if + we can. + +Discussion: + + We need an actual web server; HTTP and HTTPS are so complicated that + there's no practical way to behave in a bug-compatible way with any + popular webserver short of running that webserver. + + More obviously, we need a TLS implementation (or we can't implement + HTTPS), and we need a Tor bridge (since that's the whole point of + this exercise). + + So from a top-level point of view, the question becomes: how shall we + wire these together? + + There are three obvious ways; I'll discuss them in turn below. + +Design #1: TLS in Tor + + Under this design, Tor accepts HTTPS connections, decides which ones + don't look like the Tor protocol, and relays them to a webserver. + + +--------------------------------------+ + +------+ TLS | +------------+ http +-----------+ | + | User |<------> | Tor Bridge |<----->| Webserver | | + +------+ | +------------+ +-----------+ | + | trusted host/network | + +--------------------------------------+ + + This approach would let us use a completely unmodified webserver + implementation, but would require the most extensive changes in Tor: + we'd need to add yet another flavor to Tor's TLS ice cream parlor, + and try to emulate a popular webserver's TLS behavior even more + thoroughly. + + To authenticate, we would need to take a hybrid approach, and begin + forwarding traffic to the webserver as soon as soon as a webserver + might respond to the traffic. This could be pretty complicated, + since it requires us to have a model of how the webserver would + respond to any given set of bytes. As a workaround, we might try + relaying _all_ input to the webserver, and only replying as Tor in + the cases where the website hasn't replied. (This would likely to + create recognizable timing patterns, though.) + + The authentication itself could use a system akin to Tor proposals + 189/190, where an early AUTHORIZE cell shows knowledge of a shared + secret if the client is a Tor client. + +Design #2: TLS in the web server + + +----------------------------------+ + +------+ TLS | +------------+ tor0 +-----+ | + | User |<------> | Webserver |<------->| Tor | | + +------+ | +------------+ +-----+ | + | trusted host/network | + +----------------------------------+ + + In this design, we write an Apache module or something that can + recognize an authenticator of some kind in an HTTPS header, or + recognize a valid AUTHORIZE cell, and respond by forwarding the + traffic to a Tor instance. + + To avoid the efficiency issue of doing an extra local + encrypt/decrypt, we need to have the webserver talk to Tor over a + local unencrypted connection. (I've denoted this as "tor0" in the + diagram above.) For implementation convenience, we might want to + implement that as a NULL TLS connection, so that the Tor server code + wouldn't have to change except to allow local NULL TLS connections in + this configuration. + + For the Tor handshake to work properly here, we'll need a way for the + Tor instance to know which public key the webserver is configured to + use. + + We wouldn't need to support the parts of the Tor link protocol used + to authenticate clients to servers: relays shouldn't be using this + subsystem at all. + + The Tor client would need to connect and prove its status as a Tor + client. If the client uses some means other then AUTHORIZE cells, or + if we want to do the authentication in a pluggable transport, and we + therefore decided to offload the responsibility TLS itself to the + pluggable transport, that would scare me: Supporting pluggable + transports that have the responsibility for TLS would make it fairly + easy to mess up the crypto, and I'd rather not have it be so easy to + write a pluggable transport that accidentally makes Tor less secure. + +Design #3: Reverse proxy + + + +----------------------------------+ + | +-------+ http +-----------+ | + | | |<------>| Webserver | | + +------+ TLS | | | +-----------+ | + | User |<------> | Proxy | | + +------+ | | | tor0 +-----------+ | + | | |<------>| Tor | | + | +-------+ +-----------+ | + | trusted host/network | + +----------------------------------+ + + In this design, we write a server-side proxy to sit in front of Tor + and a webserver, or repurpose some existing HTTPS proxy. Its role + will be to do TLS, and then forward connections to Tor or the + webserver as appropriate. (In the web world, this kind of thing is + called a "reverse proxy", so that's the term I'm using here.) + + To avoid fingerprinting, we should choose a proxy that's already in + common use as a TLS frontend for webservers -- nginx, perhaps. + Unfortunately, the more popular tools here seem to be pretty complex, + and the simpler tools less widely deployed. More investigation would + be needed. + + The authorization considerations would be as in Design #2 above; for + the reasons discussed there, it's probably a good idea to build the + necessary authorization into Tor itself. + + I generally like this design best: it lets us isolate the "Check for + a valid authenticator and/or a valid or invalid HTTP header, and + react accordingly" question to a single program. + +How to authenticate: The easiest way + + Designing a good MITM-resistant AUTHORIZE cell, or an equivalent + HTTP header, is an open problem that we should solve in proposals + 190 and 191 and their successors. I'm calling it out-of-scope here; + please see those proposals, their attendant discussion, and their + eventual successors + +How to authenticate: a slightly harder way + + Some proposals in this vein have in the past suggested a special + HTTP header to distinguish Tor connections from non-Tor connections. + This could work too, though it would require substantially larger + changes on the Tor client's part, would still require the client + take measures to avoid MITM attacks, and would also require the + client to implement a particular browser's http profile. + +Some considerations on distinguishability + + Against a passive eavesdropper, the easiest way to avoid + distinguishability in server responses will be to use an actual web + server or reverse web proxy's TLS implementation. + (Distinguishability based on client TLS use is another topic + entirely.) + + Against an active non-MITM attacker, the best probing attacks will be + ones designed to provoke the system in acting in ways different from + those in which a webserver would act: responding earlier than a web + server would respond, or later, or differently. We need to make sure + that, whatever the front-end program is, it answers anything that + would qualify as a well-formed or ill-formed HTTP request whenever + the web server would. This must mean, for example, that whatever the + correct form of client authorization turns out to be, no prefix of + that authorization is ever something that the webserver would respond + to. With some web servers (I believe), that's as easy as making sure + that any valid authenticator isn't too long, and doesn't contain a CR + or LF character. With others, the authenticator would need to be a + valid HTTP request, with all the attendant difficulty that would + raise. + + Against an attacker who can MITM the bridge, the best attacks will be + to wait for clients to connect and see how they behave. In this + case, the client probably needs to be able to authenticate the bridge + certificate as presented in the initial TLS handshake -- or some + other aspect of the TLS handshake if we're feeling insane. If the + certificate or handshake isn't as expected, the client should behave + as a web browser that's just received a bad TLS certificate. (The + alternative there would be to try to impersonate an HTTPS client that + has just accepted a self-signed certificate. But that would probably + require the Tor client to impersonate a full web browser, which isn't + realistic.) + +Side note: What to put on the webserver? + + To credibly pretend not to be ourselves, we must pretend to be + something else in particular -- and something not easily identifiable + or inherently worthless. We should not, for example, have all + deployments of this kind use a fixed website, even if that website is + the default "Welcome to Apache" configuration: A censor would + probably feel that they weren't breaking anything important by + blocking all unconfigured websites with nothing on them. + + Therefore, we should probably conceive of a system like this as + "Something to add to your HTTPS website" rather than as a standalone + installation. +

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'
by nickm＠torproject.org 25 Jun '12

25 Jun '12

commit 7c9f6a994f610b27b43867ebdbe88ecb6492452f Merge: 888d5d0 53e4452 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 25 13:23:07 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' changes/bug6226 | 3 +++ src/or/transports.c | 30 ++++++++++++++++++++++-------- 2 files changed, 25 insertions(+), 8 deletions(-)

1 0

[tor/master] Don't do DNS lookups when parsing corrupted managed proxy messages.
by nickm＠torproject.org 25 Jun '12

25 Jun '12

commit 53e4452f985cad0947cd8ebfa0a1c198b6a7da7d Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Jun 25 18:30:15 2012 +0300 Don't do DNS lookups when parsing corrupted managed proxy messages. The functions parse_{s,c}method_line() were using tor_addr_port_lookup() which is capable of doing DNS lookups. DNS lookups should not be necessary when parsing {C,S}METHOD lines. --- changes/bug6226 | 3 +++ src/or/transports.c | 30 ++++++++++++++++++++++-------- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/changes/bug6226 b/changes/bug6226 new file mode 100644 index 0000000..7cbee10 --- /dev/null +++ b/changes/bug6226 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Don't do DNS lookups when parsing corrupted managed proxy + protocol messages. Fixes bug 6226; bugfix on 0.2.3.6-alpha. diff --git a/src/or/transports.c b/src/or/transports.c index e43ec6c..4ba2395 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -790,7 +790,8 @@ parse_smethod_line(const char *line, managed_proxy_t *mp) char *method_name=NULL; char *addrport=NULL; - tor_addr_t addr; + tor_addr_t tor_addr; + char *address=NULL; uint16_t port = 0; transport_t *transport=NULL; @@ -814,7 +815,7 @@ parse_smethod_line(const char *line, managed_proxy_t *mp) } addrport = smartlist_get(items, 2); - if (tor_addr_port_lookup(addrport, &addr, &port)<0) { + if (tor_addr_port_split(LOG_PROTOCOL_WARN, addrport, &address, &port)<0) { log_warn(LD_CONFIG, "Error parsing transport " "address '%s'", addrport); goto err; @@ -826,7 +827,12 @@ parse_smethod_line(const char *line, managed_proxy_t *mp) goto err; } - transport = transport_new(&addr, port, method_name, PROXY_NONE); + if (tor_addr_parse(&tor_addr, address) < 0) { + log_warn(LD_CONFIG, "Error parsing transport address '%s'", address); + goto err; + } + + transport = transport_new(&tor_addr, port, method_name, PROXY_NONE); if (!transport) goto err; @@ -835,7 +841,7 @@ parse_smethod_line(const char *line, managed_proxy_t *mp) /* For now, notify the user so that he knows where the server transport is listening. */ log_info(LD_CONFIG, "Server transport %s at %s:%d.", - method_name, fmt_addr(&addr), (int)port); + method_name, address, (int)port); r=0; goto done; @@ -846,6 +852,7 @@ parse_smethod_line(const char *line, managed_proxy_t *mp) done: SMARTLIST_FOREACH(items, char*, s, tor_free(s)); smartlist_free(items); + tor_free(address); return r; } @@ -863,7 +870,8 @@ parse_cmethod_line(const char *line, managed_proxy_t *mp) int socks_ver=PROXY_NONE; char *addrport=NULL; - tor_addr_t addr; + tor_addr_t tor_addr; + char *address=NULL; uint16_t port = 0; transport_t *transport=NULL; @@ -899,7 +907,7 @@ parse_cmethod_line(const char *line, managed_proxy_t *mp) } addrport = smartlist_get(items, 3); - if (tor_addr_port_lookup(addrport, &addr, &port)<0) { + if (tor_addr_port_split(LOG_PROTOCOL_WARN, addrport, &address, &port)<0) { log_warn(LD_CONFIG, "Error parsing transport " "address '%s'", addrport); goto err; @@ -911,7 +919,12 @@ parse_cmethod_line(const char *line, managed_proxy_t *mp) goto err; } - transport = transport_new(&addr, port, method_name, socks_ver); + if (tor_addr_parse(&tor_addr, address) < 0) { + log_warn(LD_CONFIG, "Error parsing transport address '%s'", address); + goto err; + } + + transport = transport_new(&tor_addr, port, method_name, socks_ver); if (!transport) goto err; @@ -919,7 +932,7 @@ parse_cmethod_line(const char *line, managed_proxy_t *mp) log_info(LD_CONFIG, "Transport %s at %s:%d with SOCKS %d. " "Attached to managed proxy.", - method_name, fmt_addr(&addr), (int)port, socks_ver); + method_name, address, (int)port, socks_ver); r=0; goto done; @@ -930,6 +943,7 @@ parse_cmethod_line(const char *line, managed_proxy_t *mp) done: SMARTLIST_FOREACH(items, char*, s, tor_free(s)); smartlist_free(items); + tor_free(address); return r; }

1 0

[tor/maint-0.2.3] Don't do DNS lookups when parsing corrupted managed proxy messages.
by nickm＠torproject.org 25 Jun '12

25 Jun '12

1 0

[ooni-probe/master] Future statements want to be in another place.
by art＠torproject.org 25 Jun '12

25 Jun '12

commit ce8e175bb4b0f833a728234d9c41af2ed2ca5840 Author: Arturo Filastò <hellais(a)torproject.org> Date: Mon Jun 25 19:17:38 2012 +0200 Future statements want to be in another place. --- ooni/plugoo/reports.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ooni/plugoo/reports.py b/ooni/plugoo/reports.py index 6d4c90c..71213e5 100644 --- a/ooni/plugoo/reports.py +++ b/ooni/plugoo/reports.py @@ -1,8 +1,8 @@ +from __future__ import with_statement + import os import yaml -from __future__ import with_statement - import itertools from ooni import log, date

1 0

[ooni-probe/master] Refactor report writing function to get rid of bug.
by art＠torproject.org 25 Jun '12

25 Jun '12

commit 83a6da92f2a119d825db0daf23f81eb7e8c98ae4 Author: Arturo Filastò <hellais(a)torproject.org> Date: Mon Jun 25 19:15:05 2012 +0200 Refactor report writing function to get rid of bug. --- ooni/plugoo/reports.py | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/ooni/plugoo/reports.py b/ooni/plugoo/reports.py index 6140294..6d4c90c 100644 --- a/ooni/plugoo/reports.py +++ b/ooni/plugoo/reports.py @@ -1,6 +1,8 @@ import os import yaml +from __future__ import with_statement + import itertools from ooni import log, date @@ -84,14 +86,8 @@ class Report: """ if not file: file = self.file - try: - f = open(file, mode) + with open(file, mode) as f: f.write(data) - except Exception, e: - raise e - finally: - f.close() - def tcp_report(self, data): """

1 0

[tor/master] Clean up keys on stack in rend_service_load_keys()
by nickm＠torproject.org 25 Jun '12

25 Jun '12

commit 9f55dfd915616436d00a4495bbca749a3ae7d287 Author: Andrea Shepard <andrea(a)persephoneslair.org> Date: Fri Jun 15 19:54:54 2012 -0700 Clean up keys on stack in rend_service_load_keys() --- src/or/rendservice.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 11e80b7..2713596 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -617,6 +617,8 @@ rend_service_load_keys(void) int r = 0; char fname[512]; char buf[1500]; + char desc_cook_out[3*REND_DESC_COOKIE_LEN_BASE64+1]; + char service_id[16+1]; SMARTLIST_FOREACH_BEGIN(rend_service_list, rend_service_t *, s) { if (s->private_key) @@ -709,8 +711,6 @@ rend_service_load_keys(void) * ones if a client is new. */ SMARTLIST_FOREACH_BEGIN(s->clients, rend_authorized_client_t *, client) { - char desc_cook_out[3*REND_DESC_COOKIE_LEN_BASE64+1]; - char service_id[16+1]; rend_authorized_client_t *parsed = strmap_get(parsed_clients, client->client_name); int written; @@ -727,6 +727,9 @@ rend_service_load_keys(void) REND_DESC_COOKIE_LEN) < 0) { log_warn(LD_BUG, "Could not base64-encode descriptor cookie."); strmap_free(parsed_clients, rend_authorized_client_strmap_item_free); + /* Clear these here for the early error exit */ + memset(desc_cook_out, 0, sizeof(desc_cook_out)); + memset(service_id, 0, sizeof(service_id)); return -1; } /* Copy client key from parsed entry or create new one if required. */ @@ -823,6 +826,9 @@ rend_service_load_keys(void) tor_free(client_keys_str); strmap_free(parsed_clients, rend_authorized_client_strmap_item_free); if (r<0) { + /* Clear these here for the early error exit */ + memset(desc_cook_out, 0, sizeof(desc_cook_out)); + memset(service_id, 0, sizeof(service_id)); if (open_cfile) abort_writing_to_file(open_cfile); if (open_hfile) @@ -833,7 +839,18 @@ rend_service_load_keys(void) finish_writing_to_file(open_hfile); } } + + /* + * Clear stack buffers that held key-derived material; we do this here + * for each iteration so that we don't have to put this before all of + * the early error exits (check/create directory, check service file, + * and so forth) that otherwise might have leftover key from the + * previous iteration on the stack. + */ + memset(desc_cook_out, 0, sizeof(desc_cook_out)); + memset(service_id, 0, sizeof(service_id)); } SMARTLIST_FOREACH_END(s); + return r; }

1 0

[tor/master] Clean up keys on stack in rend_service_introduce()
by nickm＠torproject.org 25 Jun '12

25 Jun '12

commit d43ba536df1b7a2433b4e1f7a2faa5a089b570c5 Author: Andrea Shepard <andrea(a)persephoneslair.org> Date: Fri Jun 15 20:19:02 2012 -0700 Clean up keys on stack in rend_service_introduce() --- src/or/rendservice.c | 40 +++++++++++++++++++++++++--------------- 1 files changed, 25 insertions(+), 15 deletions(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 2713596..85e8500 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -1055,6 +1055,7 @@ int rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request, size_t request_len) { + int status = 0; char *ptr, *r_cookie; extend_info_t *extend_info = NULL; char buf[RELAY_PAYLOAD_SIZE]; @@ -1085,7 +1086,7 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request, log_warn(LD_PROTOCOL, "Got an INTRODUCE2 over a non-introduction circuit %d.", circuit->_base.n_circ_id); - return -1; + goto err; } #ifndef NON_ANONYMOUS_MODE_ENABLED @@ -1103,7 +1104,7 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request, DH_KEY_LEN+42) { log_warn(LD_PROTOCOL, "Got a truncated INTRODUCE2 cell on circ %d.", circuit->_base.n_circ_id); - return -1; + goto err; } /* look up service depending on circuit. */ @@ -1113,7 +1114,7 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request, log_warn(LD_BUG, "Internal error: Got an INTRODUCE2 cell on an intro " "circ for an unrecognized service %s.", escaped(serviceid)); - return -1; + goto err; } /* use intro key instead of service key. */ @@ -1126,14 +1127,14 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request, (char*)request, REND_SERVICE_ID_LEN); log_warn(LD_REND, "Got an INTRODUCE2 cell for the wrong service (%s).", escaped(serviceid)); - return -1; + goto err; } keylen = crypto_pk_keysize(intro_key); if (request_len < keylen+DIGEST_LEN) { log_warn(LD_PROTOCOL, "PK-encrypted portion of INTRODUCE2 cell was truncated."); - return -1; + goto err; } intro_point = find_intro_point(circuit); @@ -1141,7 +1142,7 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request, log_warn(LD_BUG, "Internal error: Got an INTRODUCE2 cell on an intro circ " "(for service %s) with no corresponding rend_intro_point_t.", escaped(serviceid)); - return -1; + goto err; } if (!service->accepted_intro_dh_parts) @@ -1160,7 +1161,7 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request, log_warn(LD_REND, "Possible replay detected! We received an " "INTRODUCE2 cell with same PK-encrypted part %d seconds ago. " "Dropping cell.", (int)(now-*access_time)); - return -1; + goto err; } access_time = tor_malloc(sizeof(time_t)); *access_time = now; @@ -1176,7 +1177,7 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request, PK_PKCS1_OAEP_PADDING,1); if (r<0) { log_warn(LD_PROTOCOL, "Couldn't decrypt INTRODUCE2 cell."); - return -1; + goto err; } len = r; if (*buf == 3) { @@ -1191,7 +1192,7 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request, if (auth_len != REND_DESC_COOKIE_LEN) { log_info(LD_REND, "Wrong auth data size %d, should be %d.", (int)auth_len, REND_DESC_COOKIE_LEN); - return -1; + goto err; } memcpy(auth_data, buf+4, sizeof(auth_data)); v3_shift += 2+REND_DESC_COOKIE_LEN; @@ -1252,12 +1253,12 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request, if (!ptr || ptr == rp_nickname) { log_warn(LD_PROTOCOL, "Couldn't find a nul-padded nickname in INTRODUCE2 cell."); - return -1; + goto err; } if ((version == 0 && !is_legal_nickname(rp_nickname)) || (version == 1 && !is_legal_nickname_or_hexdigest(rp_nickname))) { log_warn(LD_PROTOCOL, "Bad nickname in INTRODUCE2 cell."); - return -1; + goto err; } /* Okay, now we know that a nickname is at the start of the buffer. */ ptr = rp_nickname+nickname_field_len; @@ -1421,15 +1422,24 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request, memcpy(cpath->handshake_digest, keys, DIGEST_LEN); if (extend_info) extend_info_free(extend_info); - memset(keys, 0, sizeof(keys)); - return 0; + goto done; + err: - memset(keys, 0, sizeof(keys)); + status = -1; if (dh) crypto_dh_free(dh); if (launched) circuit_mark_for_close(TO_CIRCUIT(launched), reason); if (extend_info) extend_info_free(extend_info); - return -1; + done: + memset(keys, 0, sizeof(keys)); + memset(buf, 0, sizeof(buf)); + memset(serviceid, 0, sizeof(serviceid)); + memset(hexcookie, 0, sizeof(hexcookie)); + memset(intro_key_digest, 0, sizeof(intro_key_digest)); + memset(auth_data, 0, sizeof(auth_data)); + memset(diffie_hellman_hash, 0, sizeof(diffie_hellman_hash)); + + return status; } /** Called when we fail building a rendezvous circuit at some point other

1 0

[tor/master] Clean keys on stack in rend_service_intro_has_opened()
by nickm＠torproject.org 25 Jun '12

25 Jun '12

commit 88c5d3ca55dddd39e336272c9ce56a59e0092265 Author: Andrea Shepard <andrea(a)persephoneslair.org> Date: Fri Jun 15 20:43:33 2012 -0700 Clean keys on stack in rend_service_intro_has_opened() --- src/or/rendservice.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 85e8500..50950d1 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -1627,8 +1627,8 @@ rend_service_intro_has_opened(origin_circuit_t *circuit) this case, we might as well close the thing. */ log_info(LD_CIRC|LD_REND, "We have just finished an introduction " "circuit, but we already have enough. Closing it."); - circuit_mark_for_close(TO_CIRCUIT(circuit), END_CIRC_REASON_NONE); - return; + reason = END_CIRC_REASON_NONE; + goto err; } else { tor_assert(circuit->build_state->is_internal); log_info(LD_CIRC|LD_REND, "We have just finished an introduction " @@ -1649,7 +1649,7 @@ rend_service_intro_has_opened(origin_circuit_t *circuit) } circuit_has_opened(circuit); - return; + goto done; } } @@ -1695,9 +1695,16 @@ rend_service_intro_has_opened(origin_circuit_t *circuit) goto err; } - return; + goto done; + err: circuit_mark_for_close(TO_CIRCUIT(circuit), reason); + done: + memset(buf, 0, sizeof(buf)); + memset(auth, 0, sizeof(auth)); + memset(serviceid, 0, sizeof(serviceid)); + + return; } /** Called when we get an INTRO_ESTABLISHED cell; mark the circuit as a

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
88
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits June 2012