tor-commits
Threads by month
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
November 2014
- 24 participants
- 955 discussions
[translation/https_everywhere] Update translations for https_everywhere
by translation@torproject.org 24 Nov '14
by translation@torproject.org 24 Nov '14
24 Nov '14
commit 338901cf1ac95eb093345fa163b739b6aaf36f71
Author: Translation commit bot <translation(a)torproject.org>
Date: Mon Nov 24 19:15:14 2014 +0000
Update translations for https_everywhere
---
es/https-everywhere.dtd | 2 +-
es/https-everywhere.properties | 2 +-
es/ssl-observatory.dtd | 16 ++++++++--------
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/es/https-everywhere.dtd b/es/https-everywhere.dtd
index f5c8f6c..6843ad3 100644
--- a/es/https-everywhere.dtd
+++ b/es/https-everywhere.dtd
@@ -6,7 +6,7 @@
<!ENTITY https-everywhere.about.librarians "Bibliotecarios de las reglas">
<!ENTITY https-everywhere.about.thanks "Agradecimientos para">
<!ENTITY https-everywhere.about.contribute "Si le agrada HTTPS Everywhere (HTTPS en cualquier sitio), podría considerar">
-<!ENTITY https-everywhere.about.donate_tor "donar a Tor">
+<!ENTITY https-everywhere.about.donate_tor "Donar a Tor">
<!ENTITY https-everywhere.about.tor_lang_code "es">
<!ENTITY https-everywhere.about.donate_eff "donar a la Fundación Fronteras Electrónicas (EFF)">
diff --git a/es/https-everywhere.properties b/es/https-everywhere.properties
index 601c66c..c1c0fed 100644
--- a/es/https-everywhere.properties
+++ b/es/https-everywhere.properties
@@ -3,6 +3,6 @@ https-everywhere.menu.globalDisable = Desactivar HTTPS Everywhere
https-everywhere.menu.enableDisable = Activar / Desactivar reglas
https-everywhere.menu.noRules = (No hay reglas para esta página)
https-everywhere.menu.unknownRules = (Se desconocen reglas para esta página)
-https-everywhere.toolbar.hint = HTTPS Everywhere no está activo. Puede activarlo sitio por sitio haciendo clic en el icono de la barra de direcciones.
+https-everywhere.toolbar.hint = HTTPS Everywhere está ahora activo. Puede activarlo sitio por sitio haciendo clic en el icono de la barra de direcciones.
https-everywhere.migration.notification0 = Para implementar esta reparación crucial, esta actualización restablece sus preferencias de reglas de HTTPS Everywhere a los valores predeterminados.
https-everywhere.menu.ruleset-tests = Ejecutar pruebas del conjunto de reglas de HTTPS Everywhere
diff --git a/es/ssl-observatory.dtd b/es/ssl-observatory.dtd
index 9756d38..f111110 100644
--- a/es/ssl-observatory.dtd
+++ b/es/ssl-observatory.dtd
@@ -1,6 +1,6 @@
<!-- Observatory popup window -->
<!ENTITY ssl-observatory.popup.details "Detalles e información de privacidad">
-<!ENTITY ssl-observatory.popup.later "Preguntarme luego">
+<!ENTITY ssl-observatory.popup.later "Pregúntame luego">
<!ENTITY ssl-observatory.popup.no "No">
<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere puede detectar ataques
@@ -39,7 +39,7 @@ una red corporativa muy intrusiva:">
"Esta opción precisa tener Tor instalado y ejecutandose">
<!ENTITY ssl-observatory.prefs.asn
-"Al ver un nuevo certificado, comunicar al Observatorio a qué ISP se está conectado">
+"Cuando vea un nuevo certificado, comunicar al Observatorio a qué ISP se está conectado">
<!ENTITY ssl-observatory.prefs.asn_tooltip
"Esto obtendrá y enviará el "número de Sistema Autónomo" (AS) de su red. Esto nos ayudará a ubicar ataques contra HTTPS, y a determinar si tenemos observaciones desde redes en lugares como Irán o Siria donde los ataques son comparativamente más comunes.">
@@ -65,10 +65,10 @@ Mouseover the options for further details:">-->
<!ENTITY ssl-observatory.prefs.explanation2
-"Por ejemplo, cuando visite https://www.algo.com, el certificado
+"Por ejemplo, cuando visita https://www.algo.com, el certificado
recibido por el Observatorio indicará que alguien visitó
www.algo.com, pero no quién visitó el sitio, o qué página específica
-consultó. Pase el ratón sobre las opciones para mayores detalles:">
+miró. Pase el ratón sobre las opciones para mayores detalles:">
<!ENTITY ssl-observatory.prefs.hide "Ocultar opciones avanzadas">
@@ -79,10 +79,10 @@ consultó. Pase el ratón sobre las opciones para mayores detalles:">
"Aún trataremos de mantener anónimos los datos, pero esta opción es menos segura">
<!ENTITY ssl-observatory.prefs.priv_dns
-"Enviar y verificar certificados para nombres no públicados en DNS">
+"Enviar y verificar certificados para nombres no publicados en DNS">
<!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"A menos que esta opción esté marcada, el Observatorio no registra certificados para nombres que no pueda resolver a través de DNS.">
+"A menos que esta opción esté marcada, el Observatorio no registra certificados para nombres que no pueda resolver a través del sistema DNS.">
<!ENTITY ssl-observatory.prefs.show "Mostrar opciones avanzadas">
@@ -91,9 +91,9 @@ consultó. Pase el ratón sobre las opciones para mayores detalles:">
<!ENTITY ssl-observatory.prefs.use "¿Utilizar el Observatorio?">
<!ENTITY ssl-observatory.warning.title "ADVERTENCIA del Observatorio SSL de la EFF">
<!ENTITY ssl-observatory.warning.showcert "Mostrar la cadena del certificado">
-<!ENTITY ssl-observatory.warning.okay "Entendido">
+<!ENTITY ssl-observatory.warning.okay "Entiendo">
<!ENTITY ssl-observatory.warning.text "El Observatorio SSL de la EFF ha emitido una advertencia sobre el(los) certificado(s) para este sitio:">
-<!ENTITY ssl-observatory.warning.defense "Si ha iniciado sesión en este sitio, puede que se le avise de que cambie su contraseña una vez tenga una conexión segura (estas advertencias pueden deshabilitarse en la pestaña "Observatorio SSL" del cuadro de preferencias de HTTPS Everywhere).">
+<!ENTITY ssl-observatory.warning.defense "Si ha iniciado sesión en este sitio, puede ser aconsejable que cambie su contraseña una vez tenga una conexión segura. (Estas advertencias pueden deshabilitarse en la pestaña "Observatorio SSL" del cuadro de preferencias de HTTPS Everywhere).">
<!ENTITY ssl-observatory.prefs.self_signed
"Enviar y verificar certificados auto-firmados">
1
0
24 Nov '14
commit 611558218d94584e1ef57ff7c387647d1755c402
Author: Nathan Freitas <nathan(a)freitas.net>
Date: Mon Nov 24 13:11:14 2014 -0500
onResume() must finish before we call some APIs
---
src/org/torproject/android/Orbot.java | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java
index d1c111a..7f4724c 100644
--- a/src/org/torproject/android/Orbot.java
+++ b/src/org/torproject/android/Orbot.java
@@ -902,11 +902,20 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic
protected void onResume() {
super.onResume();
- setLocale();
+ mHandler.postDelayed(new Runnable ()
+ {
+ public void run ()
+ {
+
+ setLocale();
- handleIntents();
+ handleIntents();
-
+ }
+ }
+ , 500);
+
+
}
AlertDialog aDialog = null;
1
0
commit 406d83cb501aa766d4f6f5dba4ba0bec8ef90a0f
Author: Nathan Freitas <nathan(a)freitas.net>
Date: Mon Nov 24 13:10:56 2014 -0500
add layout tweaks for v21
---
res/layout-v21/layout_notification_expanded.xml | 123 +++++++++++++++++++++++
1 file changed, 123 insertions(+)
diff --git a/res/layout-v21/layout_notification_expanded.xml b/res/layout-v21/layout_notification_expanded.xml
new file mode 100644
index 0000000..179b95e
--- /dev/null
+++ b/res/layout-v21/layout_notification_expanded.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:internal="http://schemas.android.com/apk/prv/res/android"
+ android:id="@+id/status_bar_latest_event_content"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="#333333"
+ >
+ <ImageView android:id="@+id/icon"
+ android:layout_width="@dimen/notification_large_icon_width"
+ android:layout_height="@dimen/notification_large_icon_height"
+ android:scaleType="center"
+ />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="fill_vertical"
+ android:layout_marginStart="@dimen/notification_large_icon_width"
+ android:minHeight="@dimen/notification_large_icon_height"
+ android:orientation="vertical"
+ android:paddingEnd="8dp"
+ android:paddingTop="2dp"
+ android:paddingBottom="2dp"
+ android:gravity="top"
+ >
+ <LinearLayout
+ android:id="@+id/line1"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingTop="6dp"
+ android:layout_marginStart="8dp"
+ android:orientation="horizontal"
+ >
+ <TextView android:id="@+id/title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:singleLine="true"
+ android:ellipsize="marquee"
+ android:fadingEdge="horizontal"
+ android:layout_weight="1"
+ android:textStyle="bold"
+ android:textAppearance="@style/NotificationTitle"
+ />
+
+ </LinearLayout>
+ <LinearLayout
+ android:id="@+id/line3"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:layout_marginStart="8dp"
+ >
+ <TextView android:id="@+id/text"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:layout_gravity="center"
+ android:singleLine="true"
+ android:ellipsize="marquee"
+ android:fadingEdge="horizontal"
+ android:textAppearance="@style/NotificationText"
+ />
+ <TextView android:id="@+id/info"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:layout_weight="0"
+ android:singleLine="true"
+ android:gravity="center"
+ android:paddingStart="8dp"
+ android:textAppearance="@style/NotificationText"
+ />
+ <ImageView android:id="@+id/right_icon"
+ android:layout_width="16dp"
+ android:layout_height="16dp"
+ android:layout_gravity="center"
+ android:layout_weight="0"
+ android:layout_marginStart="8dp"
+ android:scaleType="centerInside"
+ android:visibility="gone"
+ />
+ <!--
+ <ImageButton
+ android:id="@+id/_tor_notificationBT"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:src="@drawable/nav_refresh" />
+ -->
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:orientation="horizontal"
+ android:background="#999999"
+ android:layout_marginTop="3dp"
+ android:layout_marginBottom="3dp"
+
+ />
+ <TextView android:id="@+id/text2"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="-2dp"
+ android:layout_marginBottom="-2dp"
+ android:layout_marginStart="8dp"
+ android:fadingEdge="horizontal"
+ />
+ </LinearLayout>
+</FrameLayout>
1
0
commit 88873193c2d0d8ba3c624219f5d5f9b662e1edee
Author: Nathan Freitas <nathan(a)freitas.net>
Date: Mon Nov 24 13:23:29 2014 -0500
update changelog for 14.1.3
---
CHANGELOG | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 4c1e682..6402ac1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,12 +1,19 @@
NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/
-/** 14.1.1 / 17-Nov-2015 / ec1c92f51957d4e93f8da35b81b603ace17acb7a **/
+/** 14.1.3 / 24-Nov-2014 / c1f3e64b6b8a34c85a90fb2ee083431b6722ec60 **/
+
+* 87d5ac9 changes to improve longevity of background service/Tor process
+* 6115582 onResume() must finish before we call some APIs
+* 406d83c add layout tweaks for v21
+* cf21809 improves in start/stop logic for background service
+
+/** 14.1.1 / 17-Nov-2014 / ec1c92f51957d4e93f8da35b81b603ace17acb7a **/
* use non-PIE build for up to SDK 20, and PIE build only for Lollipop
* Makefile fixes: make sure polipo is really cleaned; add only PIE flags for polipo
* add support for other onboot events, including external storage mount also version up to ensure install for PIE fix
-/** 14.1 / 13-Nov-2015 / 5917e63693141dc08a99f8670ff3e274306a8c05 **/
+/** 14.1 / 13-Nov-2014 / 5917e63693141dc08a99f8670ff3e274306a8c05 **/
* Updates to support Android 5.0 Lollipop
5917e63 updates for Android L and PIE binary support
1
0
commit c1f3e64b6b8a34c85a90fb2ee083431b6722ec60
Author: Nathan Freitas <nathan(a)freitas.net>
Date: Mon Nov 24 13:21:31 2014 -0500
update version specific manifests
---
AndroidManifest.KITKAT_AND_LOWER.xml | 6 ++++--
AndroidManifest.LOLLIPOP.xml | 8 +++++---
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/AndroidManifest.KITKAT_AND_LOWER.xml b/AndroidManifest.KITKAT_AND_LOWER.xml
index 4d909b1..072729b 100644
--- a/AndroidManifest.KITKAT_AND_LOWER.xml
+++ b/AndroidManifest.KITKAT_AND_LOWER.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.torproject.android"
- android:versionName="14.1.1"
- android:versionCode="128"
+ android:versionName="14.1.3-noPIE"
+ android:versionCode="130"
android:installLocation="auto"
>
@@ -23,6 +23,7 @@
android:allowBackup="false"
android:allowClearUserData="true"
android:persistent="true"
+ android:stopWithTask="false"
>
<activity android:name=".Orbot" android:configChanges="orientation|screenSize"
@@ -85,6 +86,7 @@
<service android:enabled="true"
android:name=".service.TorService"
android:permission="org.torproject.android.MANAGE_TOR"
+ android:stopWithTask="false"
>
<intent-filter>
<action android:name="org.torproject.android.service.ITorService" />
diff --git a/AndroidManifest.LOLLIPOP.xml b/AndroidManifest.LOLLIPOP.xml
index 69d8d87..de175f9 100644
--- a/AndroidManifest.LOLLIPOP.xml
+++ b/AndroidManifest.LOLLIPOP.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.torproject.android"
- android:versionName="14.1.1-PIE"
- android:versionCode="129"
+ android:versionName="14.1.3-PIE"
+ android:versionCode="130"
android:installLocation="auto"
>
- <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="21"/>
+ <uses-sdk android:minSdkVersion="21" android:maxSdkVersion="21" android:targetSdkVersion="21"/>
<permission android:name="org.torproject.android.MANAGE_TOR" android:label="@string/permission_manage_tor_label" android:description="@string/permission_manage_tor_description" android:protectionLevel="signature"></permission>
<uses-permission android:name="android.permission.INTERNET" />
@@ -23,6 +23,7 @@
android:allowBackup="false"
android:allowClearUserData="true"
android:persistent="true"
+ android:stopWithTask="false"
>
<activity android:name=".Orbot" android:configChanges="orientation|screenSize"
@@ -85,6 +86,7 @@
<service android:enabled="true"
android:name=".service.TorService"
android:permission="org.torproject.android.MANAGE_TOR"
+ android:stopWithTask="false"
>
<intent-filter>
<action android:name="org.torproject.android.service.ITorService" />
1
0
[orbot/master] changes to improve longevity of background service/Tor process
by n8fr8@torproject.org 24 Nov '14
by n8fr8@torproject.org 24 Nov '14
24 Nov '14
commit 87d5ac9c44855dd6fe6f372f21b8e5ffa0600cf1
Author: Nathan Freitas <nathan(a)freitas.net>
Date: Mon Nov 24 13:11:38 2014 -0500
changes to improve longevity of background service/Tor process
---
AndroidManifest.xml | 8 +--
src/org/torproject/android/service/TorService.java | 57 ++++++++++----------
2 files changed, 35 insertions(+), 30 deletions(-)
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4d909b1..de175f9 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.torproject.android"
- android:versionName="14.1.1"
- android:versionCode="128"
+ android:versionName="14.1.3-PIE"
+ android:versionCode="130"
android:installLocation="auto"
>
- <uses-sdk android:minSdkVersion="9" android:maxSdkVersion="20" android:targetSdkVersion="19"/>
+ <uses-sdk android:minSdkVersion="21" android:maxSdkVersion="21" android:targetSdkVersion="21"/>
<permission android:name="org.torproject.android.MANAGE_TOR" android:label="@string/permission_manage_tor_label" android:description="@string/permission_manage_tor_description" android:protectionLevel="signature"></permission>
<uses-permission android:name="android.permission.INTERNET" />
@@ -23,6 +23,7 @@
android:allowBackup="false"
android:allowClearUserData="true"
android:persistent="true"
+ android:stopWithTask="false"
>
<activity android:name=".Orbot" android:configChanges="orientation|screenSize"
@@ -85,6 +86,7 @@
<service android:enabled="true"
android:name=".service.TorService"
android:permission="org.torproject.android.MANAGE_TOR"
+ android:stopWithTask="false"
>
<intent-filter>
<action android:name="org.torproject.android.service.ITorService" />
diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java
index adb6fcf..6323d83 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -58,6 +58,7 @@ import org.torproject.android.vpn.OrbotVpnService;
import android.annotation.SuppressLint;
import android.annotation.TargetApi;
import android.app.Application;
+import android.app.IntentService;
import android.app.Notification;
import android.app.NotificationManager;
import android.app.PendingIntent;
@@ -142,7 +143,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst
private boolean mTransProxyNetworkRefresh = false;
private ExecutorService mExecutor = Executors.newCachedThreadPool();
-
+
public void debug(String msg)
{
if (ENABLE_DEBUG_LOG)
@@ -330,8 +331,10 @@ public class TorService extends Service implements TorServiceConstants, TorConst
{
startForeground(NOTIFY_ID, mNotification);
}
-
- mNotificationManager.notify(NOTIFY_ID, mNotification);
+ else
+ {
+ mNotificationManager.notify(NOTIFY_ID, mNotification);
+ }
}
@@ -340,19 +343,9 @@ public class TorService extends Service implements TorServiceConstants, TorConst
*/
public int onStartCommand(Intent intent, int flags, int startId) {
- try
- {
-
- new Thread (new TorStarter(intent)).start();
-
- }
- catch (Exception e)
- {
- logException ("Error starting service",e);
- return Service.START_NOT_STICKY;
- }
-
- return Service.START_REDELIVER_INTENT;
+ new Thread (new TorStarter(intent)).start();
+
+ return START_REDELIVER_INTENT;
}
@@ -387,6 +380,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst
}
else if (action.equals(CMD_INIT))
{
+ initialize();
sendCallbackStatus(mCurrentStatus);
}
else if (action.equals(CMD_NEWNYM))
@@ -421,7 +415,16 @@ public class TorService extends Service implements TorServiceConstants, TorConst
logNotice("Orbot was swiped away... background service will keep running");
}
+ @Override
+ public boolean stopService(Intent name) {
+
+ logNotice("TorService is being stopped: " + name);
+
+ return super.stopService(name);
+
+ }
+ @Override
public void onDestroy ()
{
super.onDestroy();
@@ -430,6 +433,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst
unregisterReceiver(mNetworkStateReceiver);
+ clearNotifications ();
+
}
private void stopTor ()
@@ -930,22 +935,19 @@ public class TorService extends Service implements TorServiceConstants, TorConst
return true;
}
- Shell mShellTor;
-
private boolean runTorShellCmd() throws Exception
{
-
+
+ Shell shellTor;
+
String torrcPath = new File(appBinHome, TORRC_ASSET_KEY).getCanonicalPath();
updateTorConfigFile();
sendCallbackLogMessage(getString(R.string.status_starting_up));
- if (mShellTor != null)
- mShellTor.close();
-
//start Tor in the background
- mShellTor = Shell.startShell();
+ shellTor = Shell.startShell();
String torCmdString = fileTor.getCanonicalPath()
+ " DataDirectory " + appCacheHome.getCanonicalPath()
@@ -955,7 +957,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst
debug(torCmdString);
SimpleCommand shellTorCommand = new SimpleCommand(torCmdString + " --verify-config");
- mShellTor.add(shellTorCommand).waitForFinish();
+ shellTor.add(shellTorCommand).waitForFinish();
int exitCode = shellTorCommand.getExitCode();
String output = shellTorCommand.getOutput();
@@ -968,7 +970,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst
}
shellTorCommand = new SimpleCommand(torCmdString);
- mShellTor.add(shellTorCommand).waitForFinish();
+ shellTor.add(shellTorCommand).waitForFinish();
exitCode = shellTorCommand.getExitCode();
output = shellTorCommand.getOutput();
@@ -1001,6 +1003,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst
}
+ shellTor.close();
+
return true;
}
@@ -2474,6 +2478,5 @@ public class TorService extends Service implements TorServiceConstants, TorConst
// TODO Auto-generated method stub
return null;
}
-
-
+
}
1
0
24 Nov '14
commit 5179df73540925829e2db4cea8e1b523de5958d3
Author: Sukhbir Singh <sukhbir(a)torproject.org>
Date: Mon Nov 24 22:37:46 2014 +0530
Add the SPI and Jabber certs
---
projects/instantbird/build | 2 +
projects/instantbird/ccc-jabber-cacert.der | 170 +++++++++++++++++++++
projects/instantbird/config | 2 +
projects/instantbird/spi-cacert.der | 223 ++++++++++++++++++++++++++++
4 files changed, 397 insertions(+)
diff --git a/projects/instantbird/build b/projects/instantbird/build
index 353961c..f389db4 100644
--- a/projects/instantbird/build
+++ b/projects/instantbird/build
@@ -37,6 +37,8 @@ for patch in $(ls -1 ../*.patch | sort)
do
patch -p1 < $patch
done
+cat ../spi-cacert.der >> mozilla/security/nss/lib/ckfw/builtins/certdata.txt
+cat ../ccc-jabber-cacert.der >> mozilla/security/nss/lib/ckfw/builtins/certdata.txt
cd mozilla
if ls -1 $rootdir/*.mozpatch > /dev/null 2>&1
then
diff --git a/projects/instantbird/ccc-jabber-cacert.der b/projects/instantbird/ccc-jabber-cacert.der
new file mode 100644
index 0000000..abe8a43
--- /dev/null
+++ b/projects/instantbird/ccc-jabber-cacert.der
@@ -0,0 +1,170 @@
+
+#
+# Certificate "CCC Jabber Service"
+#
+# Issuer: E=support(a)cacert.org,CN=CA Cert Signing Authority,OU=http://www.cacert.org,O=Root CA
+# Serial Number: 914674 (0xdf4f2)
+# Subject: CN=jabber.ccc.de,O=Chaos Computer Club e.V.,L=Hamburg,ST=Hamburg,C=DE
+# Not Valid Before: Thu Oct 17 20:50:19 2013
+# Not Valid After : Sat Oct 17 20:50:19 2015
+# Fingerprint (SHA-256): 63:0F:F6:2F:26:2E:2E:D3:52:4E:03:1F:39:1B:72:96:FD:09:9E:CA:10:64:76:88:74:C4:49:52:6F:94:A5:41
+# Fingerprint (SHA1): 4E:09:F9:D9:F2:24:17:46:84:76:8D:46:7A:84:B1:39:B8:6A:02:1F
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "CCC Jabber Service"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\154\061\013\060\011\006\003\125\004\006\023\002\104\105\061
+\020\060\016\006\003\125\004\010\023\007\110\141\155\142\165\162
+\147\061\020\060\016\006\003\125\004\007\023\007\110\141\155\142
+\165\162\147\061\041\060\037\006\003\125\004\012\023\030\103\150
+\141\157\163\040\103\157\155\160\165\164\145\162\040\103\154\165
+\142\040\145\056\126\056\061\026\060\024\006\003\125\004\003\023
+\015\152\141\142\142\145\162\056\143\143\143\056\144\145
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
+\100\143\141\143\145\162\164\056\157\162\147
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\003\015\364\362
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\005\231\060\202\003\201\240\003\002\001\002\002\003\015
+\364\362\060\015\006\011\052\206\110\206\367\015\001\001\005\005
+\000\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157
+\157\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025
+\150\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162
+\164\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031
+\103\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040
+\101\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052
+\206\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162
+\164\100\143\141\143\145\162\164\056\157\162\147\060\036\027\015
+\061\063\061\060\061\067\062\060\065\060\061\071\132\027\015\061
+\065\061\060\061\067\062\060\065\060\061\071\132\060\154\061\013
+\060\011\006\003\125\004\006\023\002\104\105\061\020\060\016\006
+\003\125\004\010\023\007\110\141\155\142\165\162\147\061\020\060
+\016\006\003\125\004\007\023\007\110\141\155\142\165\162\147\061
+\041\060\037\006\003\125\004\012\023\030\103\150\141\157\163\040
+\103\157\155\160\165\164\145\162\040\103\154\165\142\040\145\056
+\126\056\061\026\060\024\006\003\125\004\003\023\015\152\141\142
+\142\145\162\056\143\143\143\056\144\145\060\202\001\042\060\015
+\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001
+\017\000\060\202\001\012\002\202\001\001\000\310\261\317\205\204
+\034\231\376\301\360\110\352\155\135\376\122\023\172\361\001\200
+\265\357\075\056\112\164\114\356\131\337\306\274\373\060\275\167
+\201\126\272\032\324\117\037\344\050\310\253\334\114\113\127\071
+\022\362\020\366\163\322\312\174\362\263\326\037\056\002\050\165
+\143\366\111\332\032\130\065\323\252\076\310\143\024\140\026\306
+\307\032\024\351\264\157\102\062\333\010\270\074\154\220\334\116
+\100\047\352\117\102\050\151\277\365\103\176\131\132\141\112\373
+\267\321\037\356\030\327\000\004\216\141\245\247\144\234\146\004
+\227\345\076\145\253\343\066\110\375\066\243\350\152\240\021\235
+\330\026\217\317\212\324\317\375\353\020\101\104\362\045\363\341
+\174\011\361\176\115\047\246\237\266\253\337\215\165\120\015\364
+\202\046\145\112\251\365\072\276\110\144\360\013\214\357\272\205
+\116\056\237\350\213\022\100\246\011\317\174\052\235\142\063\353
+\131\272\201\317\172\373\016\067\050\245\105\056\053\302\213\246
+\100\335\372\252\144\343\246\271\250\125\223\215\332\133\300\361
+\142\106\331\027\257\372\117\303\371\151\151\002\003\001\000\001
+\243\202\001\065\060\202\001\061\060\014\006\003\125\035\023\001
+\001\377\004\002\060\000\060\016\006\003\125\035\017\001\001\377
+\004\004\003\002\003\250\060\064\006\003\125\035\045\004\055\060
+\053\006\010\053\006\001\005\005\007\003\002\006\010\053\006\001
+\005\005\007\003\001\006\011\140\206\110\001\206\370\102\004\001
+\006\012\053\006\001\004\001\202\067\012\003\003\060\063\006\010
+\053\006\001\005\005\007\001\001\004\047\060\045\060\043\006\010
+\053\006\001\005\005\007\060\001\206\027\150\164\164\160\072\057
+\057\157\143\163\160\056\143\141\143\145\162\164\056\157\162\147
+\057\060\061\006\003\125\035\037\004\052\060\050\060\046\240\044
+\240\042\206\040\150\164\164\160\072\057\057\143\162\154\056\143
+\141\143\145\162\164\056\157\162\147\057\162\145\166\157\153\145
+\056\143\162\154\060\163\006\003\125\035\021\004\154\060\152\202
+\015\152\141\142\142\145\162\056\143\143\143\056\144\145\202\030
+\143\157\156\146\145\162\145\156\143\145\056\152\141\142\142\145
+\162\056\143\143\143\056\144\145\202\025\152\141\142\142\145\162
+\144\056\152\141\142\142\145\162\056\143\143\143\056\144\145\202
+\024\160\165\142\163\165\142\056\152\141\142\142\145\162\056\143
+\143\143\056\144\145\202\022\166\152\165\144\056\152\141\142\142
+\145\162\056\143\143\143\056\144\145\060\015\006\011\052\206\110
+\206\367\015\001\001\005\005\000\003\202\002\001\000\077\170\011
+\215\332\027\172\024\250\037\276\341\366\153\301\350\223\321\075
+\260\067\207\060\053\274\153\021\140\104\162\336\315\163\161\073
+\204\346\055\171\316\152\154\346\166\205\016\345\355\027\002\223
+\010\067\115\163\165\276\157\076\060\220\370\204\051\205\020\226
+\043\137\366\120\324\256\114\205\110\175\254\034\174\321\173\243
+\314\001\242\270\206\276\300\147\242\242\032\266\224\072\221\115
+\351\317\140\335\117\226\257\230\127\334\317\240\143\125\065\230
+\227\315\225\163\023\002\225\161\247\043\244\311\200\137\150\264
+\221\361\053\322\016\000\316\071\327\302\064\146\314\046\243\106
+\074\056\134\313\032\307\067\054\373\260\115\224\260\215\143\045
+\017\125\042\027\126\024\245\176\125\146\147\146\060\171\107\026
+\304\110\360\117\375\162\361\307\300\016\323\311\271\242\352\147
+\041\143\212\133\026\255\112\163\003\304\067\040\301\153\243\070
+\107\116\212\375\063\241\242\060\053\033\012\220\353\252\361\147
+\151\157\260\074\004\113\332\144\006\250\052\143\341\014\355\225
+\303\114\026\372\323\002\373\222\206\102\111\244\324\334\046\352
+\072\004\253\337\077\220\322\274\016\172\055\112\226\055\243\070
+\161\107\027\101\017\154\050\276\166\254\317\372\161\155\137\053
+\154\346\301\322\171\140\367\051\343\165\211\141\022\033\124\106
+\012\006\070\337\363\121\356\113\345\271\002\233\156\132\150\101
+\147\135\263\151\107\240\246\047\356\245\154\214\062\003\140\110
+\076\111\367\102\124\164\373\057\263\057\274\141\155\263\205\205
+\246\226\121\233\167\265\222\056\175\063\133\361\362\132\120\055
+\320\357\311\047\241\110\221\023\366\270\074\020\313\074\161\204
+\307\021\273\127\110\201\256\127\015\305\146\104\176\066\051\021
+\222\100\147\360\355\306\343\135\136\052\007\250\243\151\061\167
+\300\105\041\165\107\270\377\312\103\174\017\145\224\237\253\163
+\334\163\103\151\155\006\025\003\004\212\124\037\047\264\124\360
+\025\226\006\370\372\322\154\122\020\327\166\133\004\305\023\063
+\346\077\036\175\155\330\117\225\177\276\151\130\247\271\023\215
+\031\012\373\105\330\215\313\134\136\165\210\116\307\261\254\352
+\356\031\121\144\122\171\156\326\030\374\015\307\225
+END
+
+# Trust for "CCC Jabber Service"
+# Issuer: E=support(a)cacert.org,CN=CA Cert Signing Authority,OU=http://www.cacert.org,O=Root CA
+# Serial Number: 914674 (0xdf4f2)
+# Subject: CN=jabber.ccc.de,O=Chaos Computer Club e.V.,L=Hamburg,ST=Hamburg,C=DE
+# Not Valid Before: Thu Oct 17 20:50:19 2013
+# Not Valid After : Sat Oct 17 20:50:19 2015
+# Fingerprint (SHA-256): 63:0F:F6:2F:26:2E:2E:D3:52:4E:03:1F:39:1B:72:96:FD:09:9E:CA:10:64:76:88:74:C4:49:52:6F:94:A5:41
+# Fingerprint (SHA1): 4E:09:F9:D9:F2:24:17:46:84:76:8D:46:7A:84:B1:39:B8:6A:02:1F
+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "CCC Jabber Service"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\116\011\371\331\362\044\027\106\204\166\215\106\172\204\261\071
+\270\152\002\037
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\014\101\362\053\214\147\235\160\222\215\317\335\363\117\200\301
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
+\100\143\141\143\145\162\164\056\157\162\147
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\003\015\364\362
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
diff --git a/projects/instantbird/config b/projects/instantbird/config
index 41e2522..6d25676 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -62,6 +62,8 @@ input_files:
- filename: links.patch
- filename: picture.patch
- filename: prepare-messages-for-displaying.patch
+ - filename: spi-cacert.der
+ - filename: ccc-jabber-cacert.der
- filename: fix-mingw-build.nsprpatch
enable: '[% c("var/windows") %]'
- filename: fix-mingw-build.patch
diff --git a/projects/instantbird/spi-cacert.der b/projects/instantbird/spi-cacert.der
new file mode 100644
index 0000000..4b8bd47
--- /dev/null
+++ b/projects/instantbird/spi-cacert.der
@@ -0,0 +1,223 @@
+
+#
+# Certificate "SPI Root Certificate (spi-inc.org)"
+#
+# Issuer: E=hostmaster(a)spi-inc.org,CN=Certificate Authority,OU=hostmaster,O=Software in the Public Interest,L=Indianapolis,ST=Indiana,C=US
+# Serial Number:00:e8:8e:b6:c9:f8:2a:14:28
+# Subject: E=hostmaster(a)spi-inc.org,CN=Certificate Authority,OU=hostmaster,O=Software in the Public Interest,L=Indianapolis,ST=Indiana,C=US
+# Not Valid Before: Tue May 13 08:07:56 2008
+# Not Valid After : Fri May 11 08:07:56 2018
+# Fingerprint (SHA-256): 80:B1:D6:EC:2D:4C:B6:84:64:01:33:CF:37:22:C5:40:DB:2B:6C:C9:3E:EC:A4:F0:2B:A1:2A:6A:27:72:1A:2C
+# Fingerprint (SHA1): AF:70:88:43:83:82:02:15:CD:61:C6:BC:EC:FD:37:24:A9:90:43:1C
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "SPI Root Certificate (spi-inc.org)"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141
+\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144
+\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125
+\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040
+\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162
+\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157
+\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004
+\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101
+\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206
+\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163
+\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141
+\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144
+\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125
+\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040
+\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162
+\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157
+\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004
+\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101
+\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206
+\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163
+\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\011\000\350\216\266\311\370\052\024\050
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\010\016\060\202\005\366\240\003\002\001\002\002\011\000
+\350\216\266\311\370\052\024\050\060\015\006\011\052\206\110\206
+\367\015\001\001\005\005\000\060\201\274\061\013\060\011\006\003
+\125\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010
+\023\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125
+\004\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163
+\061\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167
+\141\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151
+\143\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003
+\125\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061
+\036\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146
+\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061
+\045\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026
+\150\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151
+\156\143\056\157\162\147\060\036\027\015\060\070\060\065\061\063
+\060\070\060\067\065\066\132\027\015\061\070\060\065\061\061\060
+\070\060\067\065\066\132\060\201\274\061\013\060\011\006\003\125
+\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010\023
+\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125\004
+\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163\061
+\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167\141
+\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151\143
+\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003\125
+\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061\036
+\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146\151
+\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061\045
+\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026\150
+\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151\156
+\143\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110
+\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002
+\012\002\202\002\001\000\334\066\346\107\102\302\304\121\165\051
+\207\100\303\330\216\041\006\322\030\116\353\357\040\275\220\074
+\205\020\023\214\051\133\224\143\366\364\055\361\006\102\221\271
+\031\304\102\151\010\277\213\066\105\352\050\005\063\111\110\240
+\047\103\223\065\212\101\330\170\263\360\357\263\156\055\335\321
+\313\175\352\364\165\046\323\076\220\072\356\327\347\054\004\265
+\174\341\365\174\305\116\357\167\275\134\242\223\063\222\316\175
+\201\110\317\153\265\042\054\010\203\375\323\325\317\073\055\375
+\265\111\220\133\366\255\115\023\312\336\323\246\235\123\121\161
+\143\106\370\112\026\134\230\356\055\155\232\026\241\166\220\342
+\140\103\231\326\211\326\154\056\172\230\262\013\003\054\343\172
+\117\307\335\343\314\343\112\152\215\171\122\372\364\301\257\056
+\217\052\010\313\033\051\202\222\162\103\274\316\210\251\252\247
+\212\121\103\125\205\232\067\003\170\223\310\360\275\264\101\310
+\007\102\232\313\065\227\172\212\201\145\336\035\124\010\001\361
+\144\134\267\027\032\121\274\036\303\131\207\166\030\026\230\356
+\277\366\147\201\213\006\065\305\113\155\131\031\307\322\306\110
+\276\156\024\050\203\112\020\234\033\365\157\274\251\216\365\151
+\376\262\301\125\314\347\024\311\371\133\024\123\121\007\352\316
+\075\344\117\050\037\074\141\011\327\063\322\156\247\156\324\307
+\023\011\157\153\135\024\356\235\211\033\245\152\362\366\370\320
+\162\216\352\162\037\057\064\152\051\012\305\012\354\034\100\205
+\022\367\246\245\323\117\255\300\205\214\114\174\163\040\314\123
+\030\361\262\130\114\001\365\277\352\144\325\134\071\305\316\154
+\314\123\132\126\272\101\017\045\337\153\120\266\307\212\240\275
+\002\302\305\073\125\245\262\144\042\204\121\050\126\256\061\356
+\136\373\013\026\115\106\005\221\200\104\355\254\155\360\127\250
+\372\353\141\110\240\313\033\263\037\216\315\305\041\167\003\204
+\036\374\254\243\103\010\143\214\355\371\047\357\264\260\135\147
+\326\117\355\320\213\076\135\133\311\221\275\226\002\204\075\305
+\115\274\102\077\164\375\074\135\254\134\110\066\136\207\061\057
+\030\154\304\150\356\241\213\311\131\320\030\343\000\200\263\124
+\047\056\231\360\025\123\002\003\001\000\001\243\202\002\017\060
+\202\002\013\060\035\006\003\125\035\016\004\026\004\024\064\161
+\321\070\327\025\066\203\107\153\327\067\144\102\073\216\215\122
+\235\253\060\201\361\006\003\125\035\043\004\201\351\060\201\346
+\200\024\064\161\321\070\327\025\066\203\107\153\327\067\144\102
+\073\216\215\122\235\253\241\201\302\244\201\277\060\201\274\061
+\013\060\011\006\003\125\004\006\023\002\125\123\061\020\060\016
+\006\003\125\004\010\023\007\111\156\144\151\141\156\141\061\025
+\060\023\006\003\125\004\007\023\014\111\156\144\151\141\156\141
+\160\157\154\151\163\061\050\060\046\006\003\125\004\012\023\037
+\123\157\146\164\167\141\162\145\040\151\156\040\164\150\145\040
+\120\165\142\154\151\143\040\111\156\164\145\162\145\163\164\061
+\023\060\021\006\003\125\004\013\023\012\150\157\163\164\155\141
+\163\164\145\162\061\036\060\034\006\003\125\004\003\023\025\103
+\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150\157
+\162\151\164\171\061\045\060\043\006\011\052\206\110\206\367\015
+\001\011\001\026\026\150\157\163\164\155\141\163\164\145\162\100
+\163\160\151\055\151\156\143\056\157\162\147\202\011\000\350\216
+\266\311\370\052\024\050\060\017\006\003\125\035\023\001\001\377
+\004\005\060\003\001\001\377\060\021\006\011\140\206\110\001\206
+\370\102\001\001\004\004\003\002\000\007\060\011\006\003\125\035
+\022\004\002\060\000\060\056\006\011\140\206\110\001\206\370\102
+\001\015\004\041\026\037\123\157\146\164\167\141\162\145\040\151
+\156\040\164\150\145\040\120\165\142\154\151\143\040\111\156\164
+\145\162\145\163\164\060\060\006\011\140\206\110\001\206\370\102
+\001\004\004\043\026\041\150\164\164\160\163\072\057\057\143\141
+\056\163\160\151\055\151\156\143\056\157\162\147\057\143\141\055
+\143\162\154\056\160\145\155\060\062\006\011\140\206\110\001\206
+\370\102\001\003\004\045\026\043\150\164\164\160\163\072\057\057
+\143\141\056\163\160\151\055\151\156\143\056\157\162\147\057\143
+\145\162\164\055\143\162\154\056\160\145\155\060\041\006\003\125
+\035\021\004\032\060\030\201\026\150\157\163\164\155\141\163\164
+\145\162\100\163\160\151\055\151\156\143\056\157\162\147\060\016
+\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060\015
+\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202\002
+\001\000\264\315\275\340\271\352\262\003\053\176\062\351\336\162
+\077\311\113\202\136\235\342\257\125\011\242\014\124\350\317\030
+\074\050\040\035\251\273\003\002\057\122\071\042\371\027\317\255
+\147\220\263\003\177\330\025\343\153\176\273\233\126\001\257\065
+\324\332\271\307\147\027\233\324\325\016\067\263\040\101\056\014
+\001\304\133\371\145\076\302\141\350\322\360\152\225\160\303\306
+\157\325\065\244\254\131\162\341\211\337\241\240\235\044\275\051
+\171\351\141\052\331\323\036\311\106\244\010\170\101\222\162\017
+\253\024\165\355\011\360\242\360\134\357\303\012\142\040\267\302
+\050\146\256\114\057\056\217\105\143\046\226\360\356\061\346\213
+\125\233\252\072\371\202\071\035\210\074\342\007\165\032\341\017
+\261\060\274\161\062\322\072\376\372\241\211\363\103\054\326\162
+\304\171\247\025\110\005\300\330\055\162\002\343\313\075\026\152
+\272\311\270\021\020\342\111\205\314\226\107\140\005\045\056\357
+\165\131\063\365\107\031\026\357\332\154\137\007\310\246\120\266
+\035\313\146\064\045\374\146\203\353\305\266\060\101\370\106\104
+\142\250\301\014\124\346\352\114\132\050\346\256\306\267\376\177
+\073\226\250\056\356\307\150\076\335\000\075\051\257\052\143\253
+\137\356\111\052\055\305\334\373\321\306\323\321\227\126\122\206
+\266\224\353\324\140\121\267\374\036\233\314\002\233\324\037\217
+\371\112\217\266\056\050\073\027\314\305\246\005\343\322\323\265
+\306\003\311\341\110\102\233\313\077\344\027\340\376\015\001\225
+\011\272\270\015\161\344\011\160\167\102\330\115\341\102\251\140
+\203\327\027\211\103\322\324\335\247\030\266\253\324\044\045\207
+\265\324\342\374\056\042\151\275\255\150\054\377\162\265\230\252
+\006\234\347\052\152\270\241\223\166\316\260\363\177\234\341\340
+\117\270\330\206\106\245\063\002\054\045\141\067\052\222\310\254
+\201\164\150\143\207\063\166\275\005\177\136\325\325\002\155\275
+\257\377\052\132\252\111\354\230\171\107\123\221\366\016\064\132
+\311\245\306\353\262\343\305\254\266\240\160\065\273\310\121\151
+\320\362\265\242\062\156\274\077\240\067\071\174\161\066\246\005
+\337\014\022\344\026\247\305\326\313\143\243\225\160\077\346\004
+\243\140
+END
+
+# Trust for "SPI Root Certificate (spi-inc.org)"
+# Issuer: E=hostmaster(a)spi-inc.org,CN=Certificate Authority,OU=hostmaster,O=Software in the Public Interest,L=Indianapolis,ST=Indiana,C=US
+# Serial Number:00:e8:8e:b6:c9:f8:2a:14:28
+# Subject: E=hostmaster(a)spi-inc.org,CN=Certificate Authority,OU=hostmaster,O=Software in the Public Interest,L=Indianapolis,ST=Indiana,C=US
+# Not Valid Before: Tue May 13 08:07:56 2008
+# Not Valid After : Fri May 11 08:07:56 2018
+# Fingerprint (SHA-256): 80:B1:D6:EC:2D:4C:B6:84:64:01:33:CF:37:22:C5:40:DB:2B:6C:C9:3E:EC:A4:F0:2B:A1:2A:6A:27:72:1A:2C
+# Fingerprint (SHA1): AF:70:88:43:83:82:02:15:CD:61:C6:BC:EC:FD:37:24:A9:90:43:1C
+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "SPI Root Certificate (spi-inc.org)"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\257\160\210\103\203\202\002\025\315\141\306\274\354\375\067\044
+\251\220\103\034
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\052\107\237\140\273\203\164\157\001\003\327\013\015\366\015\170
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141
+\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144
+\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125
+\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040
+\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162
+\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157
+\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004
+\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101
+\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206
+\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163
+\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\011\000\350\216\266\311\370\052\024\050
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
1
0
24 Nov '14
commit d32bc78658b3e7f46190ed68cd6c0afe725f0376
Author: Andrew Lewman <andrew(a)torproject.is>
Date: Mon Nov 24 11:51:35 2014 -0500
update mirror status as of this morning
---
include/mirrors-table.wmi | 503 ++++++++++++++++++++++++++++-----------------
include/tor-mirrors.csv | 156 +++++++-------
2 files changed, 389 insertions(+), 270 deletions(-)
diff --git a/include/mirrors-table.wmi b/include/mirrors-table.wmi
index 9e7f122..b04edea 100644
--- a/include/mirrors-table.wmi
+++ b/include/mirrors-table.wmi
@@ -1,6 +1,244 @@
<tr>
+ <td>AT</td>
+
+ <td>Tor Supporter</td>
+
+ <td>Up to date</td>
+
+ <td> - </td>
+ <td><a href="http://torproject.ph3x.at/dist/">http</a></td>
+ <td><a href="http://torproject.ph3x.at/">http</a></td>
+ <td> - </td>
+ <td> - </td>
+ <td> - </td>
+ <td> - </td>
+</tr>
+
+<tr>
+
+ <td>PL</td>
+
+ <td>Sebastian M. Bobrecki</td>
+
+ <td>Up to date</td>
+
+ <td> - </td>
+ <td><a href="http://tor.iv.net.pl/dist/">http</a></td>
+ <td><a href="http://tor.iv.net.pl">http</a></td>
+ <td><a href="https://tor.iv.net.pl/dist/">https</a></td>
+ <td><a href="https://tor.iv.net.pl">https</a></td>
+ <td> - </td>
+ <td> - </td>
+</tr>
+
+<tr>
+
+ <td>DE</td>
+
+ <td>Tor Supporter</td>
+
+ <td>Up to date</td>
+
+ <td> - </td>
+ <td><a href="http://torproject.hactar.bz/dist/">http</a></td>
+ <td><a href="http://torproject.hactar.bz">http</a></td>
+ <td> - </td>
+ <td> - </td>
+ <td> - </td>
+ <td> - </td>
+</tr>
+
+<tr>
+
+ <td>NL</td>
+
+ <td>BBLN</td>
+
+ <td>Up to date</td>
+
+ <td><a href="ftp://mirror-nl1.bbln.org/torproject/">ftp</a></td>
+ <td><a href="http://mirror-nl1.bbln.org/torproject/dist/">http</a></td>
+ <td><a href="http://mirror-nl1.bbln.org/torproject/">http</a></td>
+ <td><a href="https://mirror-nl1.bbln.org/torproject/dist/">https</a></td>
+ <td><a href="https://mirror-nl1.bbln.org/torproject/">https</a></td>
+ <td><a href="rsync://mirror-nl1.bbln.org/torproject/dist/">rsync</a></td>
+ <td><a href="rsync://mirror-nl1.bbln.org/torproject/">rsync</a></td>
+</tr>
+
+<tr>
+
+ <td>IS</td>
+
+ <td>torproject.is</td>
+
+ <td>Up to date</td>
+
+ <td> - </td>
+ <td><a href="http://www.torproject.is/dist/">http</a></td>
+ <td><a href="http://www.torproject.is/">http</a></td>
+ <td> - </td>
+ <td> - </td>
+ <td> - </td>
+ <td> - </td>
+</tr>
+
+<tr>
+
+ <td>AT</td>
+
+ <td>Tor Supporter</td>
+
+ <td>Up to date</td>
+
+ <td> - </td>
+ <td><a href="http://tor.dont-know-me.at/dist/">http</a></td>
+ <td><a href="http://tor.dont-know-me.at/">http</a></td>
+ <td> - </td>
+ <td> - </td>
+ <td> - </td>
+ <td> - </td>
+</tr>
+
+<tr>
+
+ <td>AT</td>
+
+ <td>cyberarmy</td>
+
+ <td>Up to date</td>
+
+ <td> - </td>
+ <td> - </td>
+ <td><a href="http://tor.cyberarmy.at/">http</a></td>
+ <td> - </td>
+ <td> - </td>
+ <td> - </td>
+ <td> - </td>
+</tr>
+
+<tr>
+
+ <td>RU</td>
+
+ <td>Soviet Anonymous</td>
+
+ <td>Up to date</td>
+
+ <td><a href="ftp://creep.im/mirrors/tor">ftp</a></td>
+ <td><a href="http://creep.im/tor/dist/">http</a></td>
+ <td><a href="http://creep.im/tor">http</a></td>
+ <td><a href="https://creep.im/tor/dist/">https</a></td>
+ <td><a href="https://creep.im/tor">https</a></td>
+ <td><a href="rsync://creep.im/tor-dist">rsync</a></td>
+ <td><a href="rsync://creep.im/tor">rsync</a></td>
+</tr>
+
+<tr>
+
+ <td>DE</td>
+
+ <td>PW</td>
+
+ <td>Up to date</td>
+
+ <td> - </td>
+ <td><a href="http://tor.pw.is/dist/">http</a></td>
+ <td><a href="http://tor.pw.is/">http</a></td>
+ <td> - </td>
+ <td> - </td>
+ <td> - </td>
+ <td> - </td>
+</tr>
+
+<tr>
+
+ <td>US</td>
+
+ <td>EFF</td>
+
+ <td>Up to date</td>
+
+ <td> - </td>
+ <td><a href="https://tor.eff.org/dist/">http</a></td>
+ <td><a href="https://tor.eff.org">http</a></td>
+ <td><a href="https://tor.eff.org/dist/">https</a></td>
+ <td><a href="https://tor.eff.org">https</a></td>
+ <td> - </td>
+ <td> - </td>
+</tr>
+
+<tr>
+
+ <td>FR</td>
+
+ <td>Tor Supporter</td>
+
+ <td>Up to date</td>
+
+ <td> - </td>
+ <td><a href="http://tor-mirror.zeropi.net/dist/">http</a></td>
+ <td><a href="http://tor-mirror.zeropi.net/">http</a></td>
+ <td> - </td>
+ <td> - </td>
+ <td> - </td>
+ <td> - </td>
+</tr>
+
+<tr>
+
+ <td>FR</td>
+
+ <td>BBLN</td>
+
+ <td>Up to date</td>
+
+ <td><a href="ftp://mirror-fr2.bbln.org/torproject/">ftp</a></td>
+ <td><a href="http://mirror-fr2.bbln.org/torproject/dist/">http</a></td>
+ <td><a href="http://mirror-fr2.bbln.org/torproject/">http</a></td>
+ <td><a href="https://mirror-fr2.bbln.org/torproject/dist/">https</a></td>
+ <td><a href="https://mirror-fr2.bbln.org/torproject/">https</a></td>
+ <td><a href="rsync://mirror-fr2.bbln.org/torproject/dist/">rsync</a></td>
+ <td><a href="rsync://mirror-fr2.bbln.org/torproject/">rsync</a></td>
+</tr>
+
+<tr>
+
+ <td>DE</td>
+
+ <td>Tor Supporter</td>
+
+ <td>Up to date</td>
+
+ <td> - </td>
+ <td><a href="http://neuland.dietrich.cx/dist/">http</a></td>
+ <td><a href="http://neuland.dietrich.cx/">http</a></td>
+ <td><a href="https://neuland.dietrich.cx/dist/">https</a></td>
+ <td><a href="https://neuland.dietrich.cx/">https</a></td>
+ <td> - </td>
+ <td> - </td>
+</tr>
+
+<tr>
+
+ <td>DE</td>
+
+ <td>mirror-server.de</td>
+
+ <td>Up to date</td>
+
+ <td> - </td>
+ <td><a href="http://tor.mirror-server.de/dist/">http</a></td>
+ <td><a href="http://tor.mirror-server.de/">http</a></td>
+ <td> - </td>
+ <td> - </td>
+ <td> - </td>
+ <td> - </td>
+</tr>
+
+<tr>
+
<td>DE</td>
<td>TB-ITF</td>
@@ -86,15 +324,15 @@
<tr>
- <td>AT</td>
+ <td>EE</td>
- <td>Tor Supporter</td>
+ <td>CyberSIDE</td>
<td>Up to date</td>
<td> - </td>
- <td><a href="http://tor.dont-know-me.at/dist/">http</a></td>
- <td><a href="http://tor.dont-know-me.at/">http</a></td>
+ <td><a href="http://cyberside.net.ee/tor/">http</a></td>
+ <td><a href="http://cyberside.planet.ee/tor/">http</a></td>
<td> - </td>
<td> - </td>
<td> - </td>
@@ -103,17 +341,17 @@
<tr>
- <td>AT</td>
+ <td>MX</td>
<td>Tor Supporter</td>
<td>Up to date</td>
<td> - </td>
- <td><a href="http://torproject.ph3x.at/dist/">http</a></td>
- <td><a href="http://torproject.ph3x.at/">http</a></td>
- <td> - </td>
- <td> - </td>
+ <td><a href="http://fbnaia.homelinux.net/torproject/dist/">http</a></td>
+ <td><a href="http://fbnaia.homelinux.net/torproject/">http</a></td>
+ <td><a href="https://fbnaia.homelinux.net/torproject/dist/">https</a></td>
+ <td><a href="https://fbnaia.homelinux.net/torproject/">https</a></td>
<td> - </td>
<td> - </td>
</tr>
@@ -137,6 +375,23 @@
<tr>
+ <td>US</td>
+
+ <td>HackThisSite.org</td>
+
+ <td>Up to date</td>
+
+ <td> - </td>
+ <td><a href="http://mirror.hackthissite.org/tor">http</a></td>
+ <td><a href="http://tor.hackthissite.org/">http</a></td>
+ <td><a href="https://mirror.hackthissite.org/tor">https</a></td>
+ <td><a href="https://tor.hackthissite.org/">https</a></td>
+ <td> - </td>
+ <td> - </td>
+</tr>
+
+<tr>
+
<td>DE</td>
<td>Tor Supporter</td>
@@ -171,17 +426,17 @@
<tr>
- <td>AT</td>
+ <td>DE</td>
- <td>cyberarmy</td>
+ <td>torservers</td>
<td>Up to date</td>
<td> - </td>
- <td> - </td>
- <td><a href="http://tor.cyberarmy.at/">http</a></td>
- <td> - </td>
- <td> - </td>
+ <td><a href="http://www.torservers.net/mirrors/torproject.org/dist/">http</a></td>
+ <td><a href="http://www.torservers.net/mirrors/torproject.org/">http</a></td>
+ <td><a href="https://www.torservers.net/mirrors/torproject.org/dist/">https</a></td>
+ <td><a href="https://www.torservers.net/mirrors/torproject.org/">https</a></td>
<td> - </td>
<td> - </td>
</tr>
@@ -205,34 +460,34 @@
<tr>
- <td>DE</td>
+ <td>FR</td>
- <td>PW</td>
+ <td>stalkr.net</td>
<td>Up to date</td>
<td> - </td>
- <td><a href="http://tor.pw.is/dist/">http</a></td>
- <td><a href="http://tor.pw.is/">http</a></td>
- <td> - </td>
- <td> - </td>
+ <td><a href="http://tor.stalkr.net/dist/">http</a></td>
+ <td><a href="http://tor.stalkr.net/">http</a></td>
+ <td><a href="https://tor.stalkr.net/dist/">https</a></td>
+ <td><a href="https://tor.stalkr.net/">https</a></td>
<td> - </td>
<td> - </td>
</tr>
<tr>
- <td>FR</td>
+ <td>DE</td>
- <td>stalkr.net</td>
+ <td>cYbergueRrilLa AnonyMous NeXus</td>
<td>Up to date</td>
<td> - </td>
- <td><a href="http://tor.stalkr.net/dist/">http</a></td>
- <td><a href="http://tor.stalkr.net/">http</a></td>
- <td><a href="https://tor.stalkr.net/dist/">https</a></td>
- <td><a href="https://tor.stalkr.net/">https</a></td>
+ <td><a href="https://tor-mirror.cyberguerrilla.org/dist/">http</a></td>
+ <td><a href="https://tor-mirror.cyberguerrilla.org">http</a></td>
+ <td> - </td>
+ <td> - </td>
<td> - </td>
<td> - </td>
</tr>
@@ -307,23 +562,6 @@
<tr>
- <td>PL</td>
-
- <td>Sebastian M. Bobrecki</td>
-
- <td>Up to date</td>
-
- <td> - </td>
- <td><a href="http://tor.iv.net.pl/dist/">http</a></td>
- <td><a href="http://tor.iv.net.pl">http</a></td>
- <td><a href="https://tor.iv.net.pl/dist/">https</a></td>
- <td><a href="https://tor.iv.net.pl">https</a></td>
- <td> - </td>
- <td> - </td>
-</tr>
-
-<tr>
-
<td>IS</td>
<td>Tor Supporter</td>
@@ -392,32 +630,15 @@
<tr>
- <td>US</td>
-
- <td>Setec Administrator</td>
-
- <td>Up to date</td>
-
- <td> - </td>
- <td><a href="http://tor.nuclear-weapons.net/dist">http</a></td>
- <td><a href="http://tor.nuclear-weapons.net">http</a></td>
- <td> - </td>
- <td><a href="https://tor.nuclear-weapons.net">https</a></td>
- <td><a href="https://tor.nuclear-weapons.net/dist">rsync</a></td>
- <td> - </td>
-</tr>
-
-<tr>
-
- <td>DE</td>
+ <td>AT</td>
<td>Tor Supporter</td>
<td>Up to date</td>
<td> - </td>
- <td><a href="http://torproject.hactar.bz/dist/">http</a></td>
- <td><a href="http://torproject.hactar.bz">http</a></td>
+ <td><a href="http://tor.ludikovsky.name/dist">http</a></td>
+ <td><a href="http://tor.ludikovsky.name/">http</a></td>
<td> - </td>
<td> - </td>
<td> - </td>
@@ -426,19 +647,19 @@
<tr>
- <td>NL</td>
+ <td>US</td>
- <td>BBLN</td>
+ <td>Setec Administrator</td>
<td>Up to date</td>
- <td><a href="ftp://mirror-nl1.bbln.org/torproject/">ftp</a></td>
- <td><a href="http://mirror-nl1.bbln.org/torproject/dist/">http</a></td>
- <td><a href="http://mirror-nl1.bbln.org/torproject/">http</a></td>
- <td><a href="https://mirror-nl1.bbln.org/torproject/dist/">https</a></td>
- <td><a href="https://mirror-nl1.bbln.org/torproject/">https</a></td>
- <td><a href="rsync://mirror-nl1.bbln.org/torproject/dist/">rsync</a></td>
- <td><a href="rsync://mirror-nl1.bbln.org/torproject/">rsync</a></td>
+ <td> - </td>
+ <td><a href="http://tor.nuclear-weapons.net/dist">http</a></td>
+ <td><a href="http://tor.nuclear-weapons.net">http</a></td>
+ <td> - </td>
+ <td><a href="https://tor.nuclear-weapons.net">https</a></td>
+ <td><a href="https://tor.nuclear-weapons.net/dist">rsync</a></td>
+ <td> - </td>
</tr>
<tr>
@@ -460,23 +681,6 @@
<tr>
- <td>FR</td>
-
- <td>BBLN</td>
-
- <td>Up to date</td>
-
- <td><a href="ftp://mirror-fr2.bbln.org/torproject/">ftp</a></td>
- <td><a href="http://mirror-fr2.bbln.org/torproject/dist/">http</a></td>
- <td><a href="http://mirror-fr2.bbln.org/torproject/">http</a></td>
- <td><a href="https://mirror-fr2.bbln.org/torproject/dist/">https</a></td>
- <td><a href="https://mirror-fr2.bbln.org/torproject/">https</a></td>
- <td><a href="rsync://mirror-fr2.bbln.org/torproject/dist/">rsync</a></td>
- <td><a href="rsync://mirror-fr2.bbln.org/torproject/">rsync</a></td>
-</tr>
-
-<tr>
-
<td>DE</td>
<td>0x3d.lu</td>
@@ -528,83 +732,32 @@
<tr>
- <td>UK</td>
-
- <td>justaguy</td>
-
- <td>Up to date</td>
-
- <td> - </td>
- <td><a href="http://mirrors.justaguy.pw/dist/">http</a></td>
- <td><a href="http://mirrors.justaguy.pw/">http</a></td>
- <td> - </td>
- <td> - </td>
- <td> - </td>
- <td> - </td>
-</tr>
-
-<tr>
-
<td>US</td>
- <td>Anatomical Networks</td>
-
- <td>Up to date</td>
-
- <td> - </td>
- <td><a href="http://tor.ventricle.us/dist/">http</a></td>
- <td><a href="http://tor.ventricle.us/">http</a></td>
- <td> - </td>
- <td> - </td>
- <td> - </td>
- <td> - </td>
-</tr>
-
-<tr>
-
- <td>MX</td>
-
- <td>Tor Supporter</td>
-
- <td>Up to date</td>
-
- <td> - </td>
- <td><a href="http://fbnaia.homelinux.net/torproject/dist/">http</a></td>
- <td><a href="http://fbnaia.homelinux.net/torproject/">http</a></td>
- <td><a href="https://fbnaia.homelinux.net/torproject/dist/">https</a></td>
- <td><a href="https://fbnaia.homelinux.net/torproject/">https</a></td>
- <td> - </td>
- <td> - </td>
-</tr>
-
-<tr>
-
- <td>DE</td>
-
- <td>torservers</td>
+ <td>Department of CS at USU</td>
<td>Up to date</td>
<td> - </td>
- <td><a href="http://www.torservers.net/mirrors/torproject.org/dist/">http</a></td>
- <td><a href="http://www.torservers.net/mirrors/torproject.org/">http</a></td>
- <td><a href="https://www.torservers.net/mirrors/torproject.org/dist/">https</a></td>
- <td><a href="https://www.torservers.net/mirrors/torproject.org/">https</a></td>
+ <td><a href="http://tor-relay.cs.usu.edu/mirrors/torproject.org/dist/">http</a></td>
+ <td><a href="http://tor-relay.cs.usu.edu/mirrors/torproject.org/">http</a></td>
+ <td><a href="https://www.jessevictors.com/secureMirrors/torproject.org/dist/">https</a></td>
+ <td><a href="https://www.jessevictors.com/secureMirrors/torproject.org/">https</a></td>
<td> - </td>
<td> - </td>
</tr>
<tr>
- <td>DE</td>
+ <td>UK</td>
- <td>cYbergueRrilLa AnonyMous NeXus</td>
+ <td>justaguy</td>
<td>Up to date</td>
<td> - </td>
- <td><a href="https://tor-mirror.cyberguerrilla.org/dist/">http</a></td>
- <td><a href="https://tor-mirror.cyberguerrilla.org">http</a></td>
+ <td><a href="http://mirrors.justaguy.pw/dist/">http</a></td>
+ <td><a href="http://mirrors.justaguy.pw/">http</a></td>
<td> - </td>
<td> - </td>
<td> - </td>
@@ -615,30 +768,13 @@
<td>US</td>
- <td>EFF</td>
-
- <td>Up to date</td>
-
- <td> - </td>
- <td><a href="https://tor.eff.org/dist/">http</a></td>
- <td><a href="https://tor.eff.org">http</a></td>
- <td><a href="https://tor.eff.org/dist/">https</a></td>
- <td><a href="https://tor.eff.org">https</a></td>
- <td> - </td>
- <td> - </td>
-</tr>
-
-<tr>
-
- <td>FR</td>
-
- <td>Tor Supporter</td>
+ <td>Anatomical Networks</td>
<td>Up to date</td>
<td> - </td>
- <td><a href="http://tor-mirror.zeropi.net/dist/">http</a></td>
- <td><a href="http://tor-mirror.zeropi.net/">http</a></td>
+ <td><a href="http://tor.ventricle.us/dist/">http</a></td>
+ <td><a href="http://tor.ventricle.us/">http</a></td>
<td> - </td>
<td> - </td>
<td> - </td>
@@ -647,34 +783,17 @@
<tr>
- <td>DE</td>
-
- <td>Tor Supporter</td>
-
- <td>Up to date</td>
-
- <td> - </td>
- <td><a href="http://neuland.dietrich.cx/dist/">http</a></td>
- <td><a href="http://neuland.dietrich.cx/">http</a></td>
- <td><a href="https://neuland.dietrich.cx/dist/">https</a></td>
- <td><a href="https://neuland.dietrich.cx/">https</a></td>
- <td> - </td>
- <td> - </td>
-</tr>
-
-<tr>
-
<td>US</td>
- <td>Department of CS at USU</td>
+ <td>Lucid Networks</td>
<td>Up to date</td>
<td> - </td>
- <td><a href="http://tor-relay.cs.usu.edu/mirrors/torproject.org/dist/">http</a></td>
- <td><a href="http://tor-relay.cs.usu.edu/mirrors/torproject.org/">http</a></td>
- <td><a href="https://www.jessevictors.com/secureMirrors/torproject.org/dist/">https</a></td>
- <td><a href="https://www.jessevictors.com/secureMirrors/torproject.org/">https</a></td>
+ <td><a href="http://tor.mirrors.lucidnetworks.net/dist">http</a></td>
+ <td><a href="http://tor.mirrors.lucidnetworks.net">http</a></td>
<td> - </td>
<td> - </td>
+ <td><a href="rsync://tor.mirrors.lucidnetworks.net::tor-dist">rsync</a></td>
+ <td><a href="rsync://tor.mirrors.lucidnetworks.net::tor">rsync</a></td>
</tr>
diff --git a/include/tor-mirrors.csv b/include/tor-mirrors.csv
index a99f2a4..4346280 100644
--- a/include/tor-mirrors.csv
+++ b/include/tor-mirrors.csv
@@ -16,91 +16,91 @@ Tor Fan, Tor Supporter, DE, Germany, DE, TRUE, FALSE, NO, http://tor.externenpr
mirror-service(a)netcologne.de, NetCologne GmbH, DE, NRW, TRUE, TRUE, No, http://mirror.netcologne.de/torproject.org, , rsync://mirror.netcologne.de/torproject.org, ftp://mirror.netcologne.de/torproject.org/, http://mirror.netcologne.de/torproject.org/dist, , rsync://mirror.netcologne.de/torproject.org/dist, , ,
admin AT netgull DOT com, NetGull, US, United States, North America, TRUE, TRUE, No, , , , , http://www.netgull.com/torproject/, , , ,
mirrors[at]ip-connect[dot]vn[dot]ua, IP-Connect LLC, UA, VN, TRUE, TRUE, Yes, http://torproject.ip-connect.vn.ua, , rsync://torproject.ip-connect.vn.ua/torproject, ftp://torproject.ip-connect.vn.ua/mirror/torproject/, http://torproject.ip-connect.vn.ua/dist, , rsync://torproject.ip-connect.vn.ua/torproject/dist, , ,
-torsupport AT tb-itf DOT de, TB-ITF, DE, Germany, Europe, TRUE, TRUE, No, http://tormirror.tb-itf-tor.de, https://tormirror.tb-itf-tor.de, , , , http://tormirror.tb-itf-tor.de/dist/, https://tormirror.tb-itf-tor.de/dist/, , Wed Nov 19 15:13:39 2014
+torsupport AT tb-itf DOT de, TB-ITF, DE, Germany, Europe, TRUE, TRUE, No, http://tormirror.tb-itf-tor.de, https://tormirror.tb-itf-tor.de, , , , http://tormirror.tb-itf-tor.de/dist/, https://tormirror.tb-itf-tor.de/dist/, , Mon Nov 24 06:38:57 2014
admin at koreswatanabe dottnet, Tor Supporter, RO, Romania, RO, TRUE, TRUE, No, http://tor-relay.koreswatanabe.net, , , , http://tor-relay.koreswatanabe.net/dist/, , , ,
calebcenter(a)live.com, calebxu.tk, US, United States, US, TRUE, FALSE, NO, http://tor.calebxu.tk, , rsync://calebxu.tk/tor, ftp://ftp.calebxu.tk, http://tor.calebxu.tk/dist, , , ,
maki(a)maki-chan.de, Maki Hoshisawa, DE, Germany, DE, TRUE, FALSE, NO, http://tor.mirrors.maki-chan.de/, , , , http://tor.mirrors.maki-chan.de/dist/, , , , Sat Aug 23 14:09:07 2014
info AT zentrum-der-gesundheit DOT de, Zentrum der Gesundheit, DK, Denmark, Europe, TRUE, FALSE, No, http://tor.idnr.ws/, , , , http://tor.idnr.ws/dist/, , , , Tue Sep 2 17:16:00 2014
-mirror ntzk de, Netzkonstrukt Berlin, DE, Germany, Europe, TRUE, FALSE, No, http://mirror.ntzk.de/torproject.org/, , , , http://mirror.ntzk.de/torproject.org/dist/, , , , Wed Nov 19 15:13:39 2014
-info /AT enn /DOT lu, Frenn vun der Enn A.S.B.L., IS, Iceland, Europe, TRUE, FALSE, No, http://torproject.lu/, , , , http://torproject.lu/dist/, , , http://btn6gqzqevlhoryd.onion, Wed Nov 19 15:13:39 2014
-Piratenpartei Bayern, Piratenpartei Bayern, DE, Germany, DE, TRUE, FALSE, NO, http://tormirror.piratenpartei-bayern.de, https://tormirror.piratenpartei-bayern.de, , , http://tormirror.piratenpartei-bayern.de/dist/, http://tormirror.piratenpartei-bayern.de/dist/, , , Wed Nov 19 15:13:39 2014
-Tor Fan, Tor Supporter, DE, Germany, DE, TRUE, TRUE, NO, http://tor.hoi-polloi.org, http://tor.hossi-polloiorg, , , http://tor.hoi-polloi.org/dist/, http://tor.hosi-polloi.org/dist/, , , Wed Nov 19 15:13:39 2014
-kevinmg(a)pressfreedomfoundation.org, Freedom of the Press Foundation, US, United States, US, True, False, No, http://tor.pressfreedomfoundation.org, https://tor.pressfreedomfoundation.org, , , http://tor.pressfreedomfoundation.org/dist/, https://tor.pressfreedomfoundation.org/dist/, , , Tue Nov 18 15:15:49 2014
+mirror ntzk de, Netzkonstrukt Berlin, DE, Germany, Europe, TRUE, FALSE, No, http://mirror.ntzk.de/torproject.org/, , , , http://mirror.ntzk.de/torproject.org/dist/, , , , Mon Nov 24 06:38:57 2014
+info /AT enn /DOT lu, Frenn vun der Enn A.S.B.L., IS, Iceland, Europe, TRUE, FALSE, No, http://torproject.lu/, , , , http://torproject.lu/dist/, , , http://btn6gqzqevlhoryd.onion, Mon Nov 24 06:38:57 2014
+Piratenpartei Bayern, Piratenpartei Bayern, DE, Germany, DE, TRUE, FALSE, NO, http://tormirror.piratenpartei-bayern.de, https://tormirror.piratenpartei-bayern.de, , , http://tormirror.piratenpartei-bayern.de/dist/, http://tormirror.piratenpartei-bayern.de/dist/, , , Mon Nov 24 06:38:57 2014
+Tor Fan, Tor Supporter, DE, Germany, DE, TRUE, TRUE, NO, http://tor.hoi-polloi.org, http://tor.hossi-polloiorg, , , http://tor.hoi-polloi.org/dist/, http://tor.hosi-polloi.org/dist/, , , Mon Nov 24 06:38:57 2014
+kevinmg(a)pressfreedomfoundation.org, Freedom of the Press Foundation, US, United States, US, True, False, No, http://tor.pressfreedomfoundation.org, https://tor.pressfreedomfoundation.org, , , http://tor.pressfreedomfoundation.org/dist/, https://tor.pressfreedomfoundation.org/dist/, , , Sun Nov 23 19:54:39 2014
tor(a)fodt.it // FoDT.it Webteam, FoDT.it, AT, Austria, Europe, TRUE, FALSE, No, http://tor.fodt.it, https://tor.fodt.it, , ftp://ftp.fodt.it/pub/mirrors/torproject.org/, http://tor.fodt.it/dist/, https://tor.fodt.it/dist/, , , Mon Aug 25 16:19:07 2014
-http://www.multinet.no, MultiNet AS, NO, Trondheim, Trondheim, TRUE, TRUE, No, http://tor.multinet.no/, , , , http://tor.multinet.no/dist/, , , , Wed Nov 19 15:13:39 2014
-haskell at gmx.es, Tor Supporter, ES, Spain, Europe, TRUE, FALSE, No, http://tor.zilog.es/, , , , http://tor.zilog.es/dist/, , , , Wed Nov 19 15:13:39 2014
-Tor Fan, Tor Supporter, US, United States, US, TRUE, FALSE, No, http://199.175.55.215/, , , , http://199.175.55.215/dist/, , , , Wed Nov 19 15:13:39 2014
-margus.random at mail.ee, CyberSIDE, EE, Estonia, EE, TRUE, FALSE, No, http://cyberside.planet.ee/tor/, , , , http://cyberside.net.ee/tor/, , , , Tue Nov 18 20:29:10 2014
-Tor Fan, torproject.is, IS, Iceland, IS, TRUE, FALSE, No, http://www.torproject.is/, , , , http://www.torproject.is/dist/, , , , Wed Nov 19 15:13:39 2014
-Tor Fan, spline, DE, Germany, DE, TRUE, FALSE, No, http://tor.spline.de/, https://tor.spline.inf.fu-berlin.de/, rsync://ftp.spline.de/tor, ftp://ftp.spline.de/pub/tor, http://tor.spline.de/dist/, https://tor.spline.inf.fu-berlin.de/dist/, rsync://ftp.spline.de/tor/dist, , Wed Nov 19 15:13:39 2014
-Tor Fan, me0w.cc, RO, Romania, RO, TRUE, FALSE, No, http://tor.me0w.cc/, , , , http://tor.me0w.cc/dist/, , , , Wed Nov 19 12:27:28 2014
-Tor Fan, borgmann.tv, DE, Germany, DE, TRUE, FALSE, No, http://tor.borgmann.tv/, , , , http://tor.borgmann.tv/dist/, , , , Wed Nov 19 15:13:39 2014
-Tor Fan, Tor Supporter, AT, Austria, AT, TRUE, TRUE, No, http://tor.dont-know-me.at/, , , , http://tor.dont-know-me.at/dist/, , , , Wed Nov 19 15:13:39 2014
+http://www.multinet.no, MultiNet AS, NO, Trondheim, Trondheim, TRUE, TRUE, No, http://tor.multinet.no/, , , , http://tor.multinet.no/dist/, , , , Mon Nov 24 06:38:57 2014
+haskell at gmx.es, Tor Supporter, ES, Spain, Europe, TRUE, FALSE, No, http://tor.zilog.es/, , , , http://tor.zilog.es/dist/, , , , Mon Nov 24 15:12:47 2014
+Tor Fan, Tor Supporter, US, United States, US, TRUE, FALSE, No, http://199.175.55.215/, , , , http://199.175.55.215/dist/, , , , Mon Nov 24 06:38:57 2014
+margus.random at mail.ee, CyberSIDE, EE, Estonia, EE, TRUE, FALSE, No, http://cyberside.planet.ee/tor/, , , , http://cyberside.net.ee/tor/, , , , Mon Nov 24 06:38:57 2014
+Tor Fan, torproject.is, IS, Iceland, IS, TRUE, FALSE, No, http://www.torproject.is/, , , , http://www.torproject.is/dist/, , , , Mon Nov 24 14:22:08 2014
+Tor Fan, spline, DE, Germany, DE, TRUE, FALSE, No, http://tor.spline.de/, https://tor.spline.inf.fu-berlin.de/, rsync://ftp.spline.de/tor, ftp://ftp.spline.de/pub/tor, http://tor.spline.de/dist/, https://tor.spline.inf.fu-berlin.de/dist/, rsync://ftp.spline.de/tor/dist, , Mon Nov 24 14:22:08 2014
+Tor Fan, me0w.cc, RO, Romania, RO, TRUE, FALSE, No, http://tor.me0w.cc/, , , , http://tor.me0w.cc/dist/, , , , Mon Nov 24 06:38:57 2014
+Tor Fan, borgmann.tv, DE, Germany, DE, TRUE, FALSE, No, http://tor.borgmann.tv/, , , , http://tor.borgmann.tv/dist/, , , , Mon Nov 24 14:22:08 2014
+Tor Fan, Tor Supporter, AT, Austria, AT, TRUE, TRUE, No, http://tor.dont-know-me.at/, , , , http://tor.dont-know-me.at/dist/, , , , Mon Nov 24 14:22:08 2014
coralcdn.org, CoralCDN, INT, International, INT, TRUE, FALSE, Yes, http://www.torproject.org.nyud.net/, , , , http://www.torproject.org.nyud.net/dist/, , , , Mon Oct 20 19:41:01 2014
-Tor Fan, Tor Supporter, AT, Austria, AT, TRUE, FALSE, No, http://torproject.ph3x.at/, , , , http://torproject.ph3x.at/dist/, , , , Wed Nov 19 15:13:39 2014
- mail AT benjamin-meier DOT info, beme it, DE, Germany, DE, TRUE, FALSE, No, http://tor.beme-it.de/, https://tor.beme-it.de/, rsync://tor.beme-it.de/tor, , http://tor.beme-it.de/dist/, https://tor.beme-it.de/dist/, rsync://tor.beme-it.de/tor/dist, , Wed Nov 19 15:13:39 2014
-Tor Fan, Tor Supporter, MX, Mexico, MX, TRUE, FALSE, No, http://fbnaia.homelinux.net/torproject/, https://fbnaia.homelinux.net/torproject/, , , http://fbnaia.homelinux.net/torproject/dist/, https://fbnaia.homelinux.net/torproject/dist/, , , Wed Nov 19 12:27:28 2014
-webmaster AT askapache DOT com, AskApache, US, California, US, TRUE, FALSE, No, http://tor.askapache.com/, , , , http://tor.askapache.com/dist/, , , , Wed Nov 19 15:13:39 2014
-Tor Fan, Tor Supporter, FR, France, FR, TRUE, FALSE, No, http://tor.mirror.chekanov.net/, , , , http://tor.mirror.chekanov.net/dist/, , , , Wed Nov 19 15:13:39 2014
-http://sebastian.pfeifer.or.at/, TechAsk.IT, AT, Favoriten, Wien, TRUE, TRUE, No, http://www.unicorncloud.org/public/torproject.org/, https://www.unicorncloud.org/public/torproject.org/, , , http://www.unicorncloud.org/public/torproject.org/dist, https://www.unicorncloud.org/public/torproject.org/dist, , , Wed Nov 19 15:13:39 2014
-root AT amorphis DOT eu, Amorphis, NL, The Netherlands, Europe, TRUE, FALSE, No, http://tor.amorphis.eu/, , , , http://tor.amorphis.eu/dist/, , , , Tue Nov 18 20:29:10 2014
-hackthissite.org, HackThisSite.org, US, United States, US, TRUE, TRUE, No, http://tor.hackthissite.org/, https://tor.hackthissite.org/, , , http://mirror.hackthissite.org/tor, https://mirror.hackthissite.org/tor, , , Wed Nov 19 15:13:39 2014
-Tor Fan, Tor Supporter, DE, Germany, DE, TRUE, FALSE, No, http://tor.linuxlounge.net/, https://tor.linuxlounge.net/, , , http://tor.linuxlounge.net/dist/, https://tor.linuxlounge.net/dist/, , , Wed Nov 19 15:13:39 2014
-paul at coffswifi.net, CoffsWiFi, AU, Australia and New Zealand, APNIC, TRUE, FALSE, No, http://torproject.coffswifi.net, , , , http://torproject.coffswifi.net/dist, , , , Wed Nov 19 15:13:39 2014
-Tor Fan, cyberarmy, AT, Austria, AT, TRUE, FALSE, No, http://tor.cyberarmy.at/, , , , , , , , Wed Nov 19 15:13:39 2014
-hostmaster AT example DOT com, TheOnionRouter, IS, Iceland, Iceland, TRUE, FALSE, No, http://www.theonionrouter.com/, , , , http://www.theonionrouter.com/dist/, , , , Wed Nov 19 15:13:39 2014
+Tor Fan, Tor Supporter, AT, Austria, AT, TRUE, FALSE, No, http://torproject.ph3x.at/, , , , http://torproject.ph3x.at/dist/, , , , Mon Nov 24 15:12:47 2014
+ mail AT benjamin-meier DOT info, beme it, DE, Germany, DE, TRUE, FALSE, No, http://tor.beme-it.de/, https://tor.beme-it.de/, rsync://tor.beme-it.de/tor, , http://tor.beme-it.de/dist/, https://tor.beme-it.de/dist/, rsync://tor.beme-it.de/tor/dist, , Mon Nov 24 14:22:08 2014
+Tor Fan, Tor Supporter, MX, Mexico, MX, TRUE, FALSE, No, http://fbnaia.homelinux.net/torproject/, https://fbnaia.homelinux.net/torproject/, , , http://fbnaia.homelinux.net/torproject/dist/, https://fbnaia.homelinux.net/torproject/dist/, , , Mon Nov 24 06:38:57 2014
+webmaster AT askapache DOT com, AskApache, US, California, US, TRUE, FALSE, No, http://tor.askapache.com/, , , , http://tor.askapache.com/dist/, , , , Mon Nov 24 06:38:57 2014
+Tor Fan, Tor Supporter, FR, France, FR, TRUE, FALSE, No, http://tor.mirror.chekanov.net/, , , , http://tor.mirror.chekanov.net/dist/, , , , Mon Nov 24 06:38:57 2014
+http://sebastian.pfeifer.or.at/, TechAsk.IT, AT, Favoriten, Wien, TRUE, TRUE, No, http://www.unicorncloud.org/public/torproject.org/, https://www.unicorncloud.org/public/torproject.org/, , , http://www.unicorncloud.org/public/torproject.org/dist, https://www.unicorncloud.org/public/torproject.org/dist, , , Mon Nov 24 06:38:57 2014
+root AT amorphis DOT eu, Amorphis, NL, The Netherlands, Europe, TRUE, FALSE, No, http://tor.amorphis.eu/, , , , http://tor.amorphis.eu/dist/, , , , Sun Nov 23 21:09:00 2014
+hackthissite.org, HackThisSite.org, US, United States, US, TRUE, TRUE, No, http://tor.hackthissite.org/, https://tor.hackthissite.org/, , , http://mirror.hackthissite.org/tor, https://mirror.hackthissite.org/tor, , , Mon Nov 24 06:38:57 2014
+Tor Fan, Tor Supporter, DE, Germany, DE, TRUE, FALSE, No, http://tor.linuxlounge.net/, https://tor.linuxlounge.net/, , , http://tor.linuxlounge.net/dist/, https://tor.linuxlounge.net/dist/, , , Mon Nov 24 06:38:57 2014
+paul at coffswifi.net, CoffsWiFi, AU, Australia and New Zealand, APNIC, TRUE, FALSE, No, http://torproject.coffswifi.net, , , , http://torproject.coffswifi.net/dist, , , , Mon Nov 24 06:38:57 2014
+Tor Fan, cyberarmy, AT, Austria, AT, TRUE, FALSE, No, http://tor.cyberarmy.at/, , , , , , , , Mon Nov 24 14:22:08 2014
+hostmaster AT example DOT com, TheOnionRouter, IS, Iceland, Iceland, TRUE, FALSE, No, http://www.theonionrouter.com/, , , , http://www.theonionrouter.com/dist/, , , , Mon Nov 24 14:22:08 2014
Tor Fan, crazyhaze.de, DE, Germany, DE, TRUE, FALSE, No, http://tor.crazyhaze.de/, https://tor.crazyhaze.de/, , , http://tor.crazyhaze.de/dist/, https://tor.crazyhaze.de/dist/, , , Tue Oct 21 06:55:00 2014
-Tor Fan, chaos darmstadt, DE, Germany, Europe, TRUE, FALSE, No, http://mirrors.chaos-darmstadt.de/tor-mirror/, , , , http://mirrors.chaos-darmstadt.de/tor-mirror/dist/, , , , Wed Nov 19 12:27:28 2014
-Tor Fan, Soviet Anonymous, RU, Russia, RU, TRUE, FALSE, No, http://creep.im/tor, https://creep.im/tor, rsync://creep.im/tor, ftp://creep.im/mirrors/tor, http://creep.im/tor/dist/, https://creep.im/tor/dist/, rsync://creep.im/tor-dist, , Mon Oct 27 16:18:23 2014
-Tor Fan, torservers, DE, Germany, DE, TRUE, FALSE, No, http://www.torservers.net/mirrors/torproject.org/, https://www.torservers.net/mirrors/torproject.org/, , , http://www.torservers.net/mirrors/torproject.org/dist/, https://www.torservers.net/mirrors/torproject.org/dist/, , http://hbpvnydyyjbmhx6b.onion/mirrors/torproject.org/, Wed Nov 19 12:27:28 2014
-Tor Fan, torland, GB, United Kingdom, GB, TRUE, FALSE, No, http://mirror.torland.me/torproject.org/, https://mirror.torland.me/torproject.org/, , , http://mirror.torland.me/torproject.org/dist/, https://mirror.torland.me/torproject.org/dist/, , , Wed Nov 19 15:13:39 2014
-Tor Fan, Lightning-bolt.net, CZ, Czech Republic, CZ, TRUE, FALSE, No, http://torproject.lightning-bolt.net/, , , , http://torproject.lightning-bolt.net/dist/, , , , Wed Nov 19 15:13:39 2014
-IceBear, myRL.net, IS, Iceland, IS, TRUE, FALSE, No, http://tor.myrl.net/, https://tor.myrl.net/, , , http://tor.myrl.net/dist/, https://tor.myrl.net/dist/, , , Wed Nov 19 15:13:39 2014
-kiro AT userzap DOT de, Userzap, DE, Germany, DE, TRUE, FALSE, No, http://torprojekt.userzap.de, https://torprojekt.userzap.de, , , http://torprojekt.userzap.de/dist/, https://torprojekt.userzap.de/dist/, , , Wed Nov 19 15:13:39 2014
-tor(a)eprci.net, EPRCI, US, United States, US, TRUE, FALSE, NO, http://tor.eprci.net/, https://www.eprci.com/tor/, , , http://tor.eprci.net/dist/, https://www.eprci.com/tor/dist/, , , Wed Nov 19 15:13:39 2014
-tor(a)les.net, tor(a)les.net, CA, Canada, CA, TRUE, FALSE, NO, http://tor.les.net/, , , , http://tor.les.net/dist, , , , Wed Nov 19 15:13:39 2014
-Tor Fan, PW, DE, Germany, DE, TRUE, TRUE, NO, http://tor.pw.is/, , , , http://tor.pw.is/dist/, , , , Wed Nov 19 15:13:39 2014
-tor(a)stalkr.net, stalkr.net, FR, France, FR, TRUE, TRUE, NO, http://tor.stalkr.net/, https://tor.stalkr.net/, , , http://tor.stalkr.net/dist/, https://tor.stalkr.net/dist/, , , Wed Nov 19 15:13:39 2014
-doemela[AT]cyberguerrilla[DOT]org, cYbergueRrilLa AnonyMous NeXus, DE, Germany, DE, TRUE, FALSE, NO, https://tor-mirror.cyberguerrilla.org, , , , https://tor-mirror.cyberguerrilla.org/dist/, , , http://6dvj6v5imhny3anf.onion, Wed Nov 19 12:27:28 2014
-contact(a)gtor.org, Gtor, DE, Germany, DE, TRUE, TRUE, NO, http://torproject.gtor.org/, https://torproject.gtor.org/, rsync://torproject.gtor.org/website-mirror/, , http://torproject.gtor.org/dist/, https://torproject.gtor.org/dist/, rsync://torproject.gtor.org/website-mirror/dist/, , Wed Nov 19 15:13:39 2014
-SDL, SDL, US, United States, US, TRUE, TRUE, NO, http://torproject.nexiom.net, https://torproject.nexiom.net, , , http://torproject.nexiom.net, https://torproject.nexiom.net/dist, , , Wed Nov 19 12:27:28 2014
-Tor Fan, Tor Supporter, DE, Germany, DE, TRUE, TRUE, NO, http://mirror.velcommuta.de/tor/, https://mirror.velcommuta.de/tor/, , , http://mirror.velcommuta.de/tor/dist/, https://mirror.velcommuta.de/tor/dist/, , , Wed Nov 19 15:13:39 2014
-EFF, EFF, US, United States, US, TRUE, FALSE, NO, https://tor.eff.org, https://tor.eff.org, , , https://tor.eff.org/dist/, https://tor.eff.org/dist/, , , Wed Nov 19 12:27:28 2014
-Tor Fan, Tor Supporter, GR, Greece, GR, TRUE, TRUE, NO, https://tor.void.gr, https://tor.void.gr, , , https://tor.void.gr/dist/, https://tor.void.gr/dist/, , , Wed Nov 19 15:13:39 2014
-Ich Eben, Tor Supporter, DE, Germany, DE, TRUE, TRUE, No, http://reichster.de/mirrors/torproject.org/, https://reichster.de/mirrors/torproject.org, , , http://reichster.de/mirrors/torproject.org/dist/, https://reichster.de/mirrors/torproject.org/dist/, , , Wed Nov 19 15:13:39 2014
-jlgaddis AT gnu DOT org, Evil Routers, US, United States, US, TRUE, FALSE, No, http://tor1.evilrouters.net/, , , , http://tor1.evilrouters.net/dist/, , , , Wed Nov 19 15:13:39 2014
-tor AT miglix DOT eu, Tor Supporter, DE, Germany, Europe, TRUE, TRUE, NO, http://tor.miglix.eu, https://tor.miglix.eu, , , http://tor.miglix.eu/dist/, https://tor.miglix.eu/dist/, , , Wed Nov 19 15:13:39 2014
+Tor Fan, chaos darmstadt, DE, Germany, Europe, TRUE, FALSE, No, http://mirrors.chaos-darmstadt.de/tor-mirror/, , , , http://mirrors.chaos-darmstadt.de/tor-mirror/dist/, , , , Mon Nov 24 14:22:08 2014
+Tor Fan, Soviet Anonymous, RU, Russia, RU, TRUE, FALSE, No, http://creep.im/tor, https://creep.im/tor, rsync://creep.im/tor, ftp://creep.im/mirrors/tor, http://creep.im/tor/dist/, https://creep.im/tor/dist/, rsync://creep.im/tor-dist, , Mon Nov 24 14:22:08 2014
+Tor Fan, torservers, DE, Germany, DE, TRUE, FALSE, No, http://www.torservers.net/mirrors/torproject.org/, https://www.torservers.net/mirrors/torproject.org/, , , http://www.torservers.net/mirrors/torproject.org/dist/, https://www.torservers.net/mirrors/torproject.org/dist/, , http://hbpvnydyyjbmhx6b.onion/mirrors/torproject.org/, Mon Nov 24 06:38:57 2014
+Tor Fan, torland, GB, United Kingdom, GB, TRUE, FALSE, No, http://mirror.torland.me/torproject.org/, https://mirror.torland.me/torproject.org/, , , http://mirror.torland.me/torproject.org/dist/, https://mirror.torland.me/torproject.org/dist/, , , Mon Nov 24 14:22:08 2014
+Tor Fan, Lightning-bolt.net, CZ, Czech Republic, CZ, TRUE, FALSE, No, http://torproject.lightning-bolt.net/, , , , http://torproject.lightning-bolt.net/dist/, , , , Mon Nov 24 14:22:08 2014
+IceBear, myRL.net, IS, Iceland, IS, TRUE, FALSE, No, http://tor.myrl.net/, https://tor.myrl.net/, , , http://tor.myrl.net/dist/, https://tor.myrl.net/dist/, , , Mon Nov 24 06:38:57 2014
+kiro AT userzap DOT de, Userzap, DE, Germany, DE, TRUE, FALSE, No, http://torprojekt.userzap.de, https://torprojekt.userzap.de, , , http://torprojekt.userzap.de/dist/, https://torprojekt.userzap.de/dist/, , , Sun Nov 23 21:09:00 2014
+tor(a)eprci.net, EPRCI, US, United States, US, TRUE, FALSE, NO, http://tor.eprci.net/, https://www.eprci.com/tor/, , , http://tor.eprci.net/dist/, https://www.eprci.com/tor/dist/, , , Mon Nov 24 06:38:57 2014
+tor(a)les.net, tor(a)les.net, CA, Canada, CA, TRUE, FALSE, NO, http://tor.les.net/, , , , http://tor.les.net/dist, , , , Mon Nov 24 06:38:57 2014
+Tor Fan, PW, DE, Germany, DE, TRUE, TRUE, NO, http://tor.pw.is/, , , , http://tor.pw.is/dist/, , , , Mon Nov 24 14:22:08 2014
+tor(a)stalkr.net, stalkr.net, FR, France, FR, TRUE, TRUE, NO, http://tor.stalkr.net/, https://tor.stalkr.net/, , , http://tor.stalkr.net/dist/, https://tor.stalkr.net/dist/, , , Mon Nov 24 06:38:57 2014
+doemela[AT]cyberguerrilla[DOT]org, cYbergueRrilLa AnonyMous NeXus, DE, Germany, DE, TRUE, FALSE, NO, https://tor-mirror.cyberguerrilla.org, , , , https://tor-mirror.cyberguerrilla.org/dist/, , , http://6dvj6v5imhny3anf.onion, Mon Nov 24 06:38:57 2014
+contact(a)gtor.org, Gtor, DE, Germany, DE, TRUE, TRUE, NO, http://torproject.gtor.org/, https://torproject.gtor.org/, rsync://torproject.gtor.org/website-mirror/, , http://torproject.gtor.org/dist/, https://torproject.gtor.org/dist/, rsync://torproject.gtor.org/website-mirror/dist/, , Mon Nov 24 06:38:57 2014
+SDL, SDL, US, United States, US, TRUE, TRUE, NO, http://torproject.nexiom.net, https://torproject.nexiom.net, , , http://torproject.nexiom.net, https://torproject.nexiom.net/dist, , , Mon Nov 24 06:38:57 2014
+Tor Fan, Tor Supporter, DE, Germany, DE, TRUE, TRUE, NO, http://mirror.velcommuta.de/tor/, https://mirror.velcommuta.de/tor/, , , http://mirror.velcommuta.de/tor/dist/, https://mirror.velcommuta.de/tor/dist/, , , Mon Nov 24 06:38:57 2014
+EFF, EFF, US, United States, US, TRUE, FALSE, NO, https://tor.eff.org, https://tor.eff.org, , , https://tor.eff.org/dist/, https://tor.eff.org/dist/, , , Mon Nov 24 14:22:08 2014
+Tor Fan, Tor Supporter, GR, Greece, GR, TRUE, TRUE, NO, https://tor.void.gr, https://tor.void.gr, , , https://tor.void.gr/dist/, https://tor.void.gr/dist/, , , Mon Nov 24 06:38:57 2014
+Ich Eben, Tor Supporter, DE, Germany, DE, TRUE, TRUE, No, http://reichster.de/mirrors/torproject.org/, https://reichster.de/mirrors/torproject.org, , , http://reichster.de/mirrors/torproject.org/dist/, https://reichster.de/mirrors/torproject.org/dist/, , , Mon Nov 24 06:38:57 2014
+jlgaddis AT gnu DOT org, Evil Routers, US, United States, US, TRUE, FALSE, No, http://tor1.evilrouters.net/, , , , http://tor1.evilrouters.net/dist/, , , , Mon Nov 24 06:38:57 2014
+tor AT miglix DOT eu, Tor Supporter, DE, Germany, Europe, TRUE, TRUE, NO, http://tor.miglix.eu, https://tor.miglix.eu, , , http://tor.miglix.eu/dist/, https://tor.miglix.eu/dist/, , , Mon Nov 24 06:38:57 2014
tor TA ninurta TOD name, TorNinurtaName, AT, Austria, AT, TRUE, TRUE, no, http://tor.ninurta.name/, , , , http://tor.ninurta.name/dist/, , , , Wed Oct 22 21:02:17 2014
-fr33tux <AT> general-changelog-team.fr, Tor Supporter, FR, France, FR, TRUE, TRUE, No, http://tor.fr33tux.org, https://tor.fr33tux.org, , , http://tor.fr33tux.org/dist/, https://tor.fr33tux.org/dist/, , , Wed Nov 19 15:13:39 2014
-sebastian(at)bobrecki(dot)pl, Sebastian M. Bobrecki, PL, Poland, Europe, TRUE, FALSE, No, http://tor.iv.net.pl, https://tor.iv.net.pl, , , http://tor.iv.net.pl/dist/, https://tor.iv.net.pl/dist/, , , Wed Nov 19 15:13:39 2014
-tor-mirror AT rdns DOT cc, d0wn.biz, FR, France, Europe, TRUE, FALSE, No, http://tor.static.lu, https://tor.static.lu, , , http://tor.static.lu/dist/, https://tor.static.lu/dist/, , , Wed Nov 19 12:27:28 2014
-tor(a)moparisthebest.com, moparisthebest.com, DE, Germany, Europe, TRUE, TRUE, No, http://www.moparisthebest.com/tor/, https://www.moparisthebest.com/tor/, , , http://www.moparisthebest.com/tor/dist/, https://www.moparisthebest.com/tor/dist/, , , Wed Nov 19 15:13:39 2014
-Sebastian, Maxanoo, NL, The Netherlands, Amsterdam, TRUE, FALSE, NO, http://tor.maxanoo.com/, , , , http://tor.maxanoo.com/dist/, , , , Wed Nov 19 15:13:39 2014
-rorrim AT ayo DOT tl, Tor Supporter, IS, Iceland, Europe, TRUE, TRUE, No, http://ayo.tl/tor/, https://ayo.tl/tor/, , , http://ayo.tl/tor/dist/, https://ayo.tl/tor/dist/, , , Wed Nov 19 15:13:39 2014
-stefano.fenoglio AT gmail DOT com, Tor Supporter, IT, Italy, Europe, TRUE, FALSE, No, http://tor.stefanof.com, , , , , , http://tor.stefanof.com/dist, , Wed Nov 19 15:13:39 2014
-Jacob Henner, Anatomical Networks, US, United States, US, TRUE, TRUE, TRUE, http://tor.ventricle.us/, , , , http://tor.ventricle.us/dist/, , , , Wed Nov 19 15:13:39 2014
-webmaster[at]hackabit.nl, Hackabit.nl, NL, The Netherlands, Europe, TRUE, FALSE, No, http://hackabit.nl/tor/, https://hackabit.nl/tor/, , , http://hackabit.nl/tor/dist/, https://hackabit.nl/tor/dist/, , , Wed Nov 19 15:13:39 2014
-Tor Fan, Ramos Research, US, United States, US, TRUE, TRUE, No, http://tor.ramosresearch.com/, , , , http://tor.ramosresearch.com/dist/, , , , Wed Nov 19 15:13:39 2014
-Tor Fan, Tor Supporter, DE, Germany, Europe, TRUE, FALSE, No, http://tor.euve33747.vserver.de/, , , , http://tor.euve33747.vserver.de/dist, , , , Wed Nov 19 15:13:39 2014
-s7r[at]sky-ip[d0t]org, sky-ip.org, NL, Netherlands, NL, TRUE, FALSE, No, http://beautiful-mind.sky-ip.org/, , , , http://beautiful-mind.sky-ip.org/dist/, , , , Wed Nov 19 15:13:39 2014
-tor#pajonzeck#de, ITsn, DE, Germany, Europe, TRUE, FALSE, No, http://tor.pajonzeck.de/, https://tor.pajonzeck.de/, rsync://tor.pajonzeck.de/tor, http://tor.pajonzeck.de/dist/, https://tor.pajonzeck.de/dist/, , rsync://tor.pajonzeck.de/tor/dist, http://zgfgvob256pffy62.onion, Wed Nov 19 15:13:39 2014
-peter AT ludikovsky DOT name, Tor Supporter, AT, Austria, Europe, TRUE, TRUE, No, http://tor.ludikovsky.name/, , , , http://tor.ludikovsky.name/dist, , , http://54lnbzjo6xlr4f4j.onion/, Tue Oct 28 08:37:30 2014
-admin AT nuclear DASH weapons DOT net, Setec Administrator, US, Texas, Austin, TRUE, FALSE, No, http://tor.nuclear-weapons.net, https://tor.nuclear-weapons.net, , , http://tor.nuclear-weapons.net/dist, , https://tor.nuclear-weapons.net/dist, , Wed Nov 19 15:13:39 2014
-0x43DE8191, Tor Supporter, DE, Germany, Europe, TRUE, TRUE, No, http://torproject.hactar.bz, , , , http://torproject.hactar.bz/dist/, , , , Wed Nov 19 15:13:39 2014
--nick at calyx dot com, The Calyx Institute, US, United States, North America, TRUE, FALSE, No, http://tor.calyxinstitute.org, https://tor.calyxinstitute.org, , , http://tor.calyxinstitute.org/dist/, https://tor.calyxinstitute.org/dist/, , http://tmdrhl4e4anhsjc5.onion, Wed Nov 19 15:13:39 2014
-opi(a)zeropi.net, Tor Supporter, FR, France, FR, TRUE, TRUE, No, http://tor-mirror.zeropi.net/, , , , http://tor-mirror.zeropi.net/dist/, , , , Wed Nov 19 12:27:28 2014
-noc AT bbln DOT org, BBLN, NL, The Netherlands, Europe, TRUE, TRUE, No, http://mirror-nl1.bbln.org/torproject/, https://mirror-nl1.bbln.org/torproject/, rsync://mirror-nl1.bbln.org/torproject/, ftp://mirror-nl1.bbln.org/torproject/, http://mirror-nl1.bbln.org/torproject/dist/, https://mirror-nl1.bbln.org/torproject/dist/, rsync://mirror-nl1.bbln.org/torproject/dist/, , Wed Nov 19 15:13:39 2014
-noc AT bbln DOT org, BBLN, FR, France, Europe, TRUE, TRUE, No, http://mirror-fr1.bbln.org/torproject/, https://mirror-fr1.bbln.org/torproject/, rsync://mirror-fr1.bbln.org/torproject/, ftp://mirror-fr1.bbln.org/torproject/, http://mirror-fr1.bbln.org/torproject/dist/, https://mirror-fr1.bbln.org/torproject/dist/, rsync://mirror-fr1.bbln.org/torproject/dist/, , Wed Nov 19 15:13:39 2014
-noc AT bbln DOT org, BBLN, FR, France, Europe, TRUE, TRUE, No, http://mirror-fr2.bbln.org/torproject/, https://mirror-fr2.bbln.org/torproject/, rsync://mirror-fr2.bbln.org/torproject/, ftp://mirror-fr2.bbln.org/torproject/, http://mirror-fr2.bbln.org/torproject/dist/, https://mirror-fr2.bbln.org/torproject/dist/, rsync://mirror-fr2.bbln.org/torproject/dist/, , Wed Nov 19 15:13:39 2014
-alexander AT dietrich DOT cx, Tor Supporter, DE, Germany, Europe, TRUE, TRUE, No, http://neuland.dietrich.cx/, https://neuland.dietrich.cx/, , , http://neuland.dietrich.cx/dist/, https://neuland.dietrich.cx/dist/, , , Wed Nov 19 12:27:28 2014
-tor(a)0x3d.lu, 0x3d.lu, DE, Germany, Europe, TRUE, FALSE, No, http://tor.0x3d.lu/, https://tor.0x3d.lu/, , , http://tor.0x3d.lu/dist/, https://tor.0x3d.lu/dist/, , , Wed Nov 19 15:13:39 2014
+fr33tux <AT> general-changelog-team.fr, Tor Supporter, FR, France, FR, TRUE, TRUE, No, http://tor.fr33tux.org, https://tor.fr33tux.org, , , http://tor.fr33tux.org/dist/, https://tor.fr33tux.org/dist/, , , Mon Nov 24 06:38:57 2014
+sebastian(at)bobrecki(dot)pl, Sebastian M. Bobrecki, PL, Poland, Europe, TRUE, FALSE, No, http://tor.iv.net.pl, https://tor.iv.net.pl, , , http://tor.iv.net.pl/dist/, https://tor.iv.net.pl/dist/, , , Mon Nov 24 15:12:47 2014
+tor-mirror AT rdns DOT cc, d0wn.biz, FR, France, Europe, TRUE, FALSE, No, http://tor.static.lu, https://tor.static.lu, , , http://tor.static.lu/dist/, https://tor.static.lu/dist/, , , Mon Nov 24 06:38:57 2014
+tor(a)moparisthebest.com, moparisthebest.com, DE, Germany, Europe, TRUE, TRUE, No, http://www.moparisthebest.com/tor/, https://www.moparisthebest.com/tor/, , , http://www.moparisthebest.com/tor/dist/, https://www.moparisthebest.com/tor/dist/, , , Mon Nov 24 14:22:08 2014
+Sebastian, Maxanoo, NL, The Netherlands, Amsterdam, TRUE, FALSE, NO, http://tor.maxanoo.com/, , , , http://tor.maxanoo.com/dist/, , , , Mon Nov 24 14:22:08 2014
+rorrim AT ayo DOT tl, Tor Supporter, IS, Iceland, Europe, TRUE, TRUE, No, http://ayo.tl/tor/, https://ayo.tl/tor/, , , http://ayo.tl/tor/dist/, https://ayo.tl/tor/dist/, , , Mon Nov 24 06:38:57 2014
+stefano.fenoglio AT gmail DOT com, Tor Supporter, IT, Italy, Europe, TRUE, FALSE, No, http://tor.stefanof.com, , , , , , http://tor.stefanof.com/dist, , Mon Nov 24 06:38:57 2014
+Jacob Henner, Anatomical Networks, US, United States, US, TRUE, TRUE, TRUE, http://tor.ventricle.us/, , , , http://tor.ventricle.us/dist/, , , , Mon Nov 24 06:38:57 2014
+webmaster[at]hackabit.nl, Hackabit.nl, NL, The Netherlands, Europe, TRUE, FALSE, No, http://hackabit.nl/tor/, https://hackabit.nl/tor/, , , http://hackabit.nl/tor/dist/, https://hackabit.nl/tor/dist/, , , Mon Nov 24 06:38:57 2014
+Tor Fan, Ramos Research, US, United States, US, TRUE, TRUE, No, http://tor.ramosresearch.com/, , , , http://tor.ramosresearch.com/dist/, , , , Mon Nov 24 06:38:57 2014
+Tor Fan, Tor Supporter, DE, Germany, Europe, TRUE, FALSE, No, http://tor.euve33747.vserver.de/, , , , http://tor.euve33747.vserver.de/dist, , , , Mon Nov 24 06:38:57 2014
+s7r[at]sky-ip[d0t]org, sky-ip.org, NL, Netherlands, NL, TRUE, FALSE, No, http://beautiful-mind.sky-ip.org/, , , , http://beautiful-mind.sky-ip.org/dist/, , , , Mon Nov 24 06:38:57 2014
+tor#pajonzeck#de, ITsn, DE, Germany, Europe, TRUE, FALSE, No, http://tor.pajonzeck.de/, https://tor.pajonzeck.de/, rsync://tor.pajonzeck.de/tor, http://tor.pajonzeck.de/dist/, https://tor.pajonzeck.de/dist/, , rsync://tor.pajonzeck.de/tor/dist, http://zgfgvob256pffy62.onion, Mon Nov 24 14:22:08 2014
+peter AT ludikovsky DOT name, Tor Supporter, AT, Austria, Europe, TRUE, TRUE, No, http://tor.ludikovsky.name/, , , , http://tor.ludikovsky.name/dist, , , http://54lnbzjo6xlr4f4j.onion/, Mon Nov 24 06:38:57 2014
+admin AT nuclear DASH weapons DOT net, Setec Administrator, US, Texas, Austin, TRUE, FALSE, No, http://tor.nuclear-weapons.net, https://tor.nuclear-weapons.net, , , http://tor.nuclear-weapons.net/dist, , https://tor.nuclear-weapons.net/dist, , Mon Nov 24 06:38:57 2014
+0x43DE8191, Tor Supporter, DE, Germany, Europe, TRUE, TRUE, No, http://torproject.hactar.bz, , , , http://torproject.hactar.bz/dist/, , , , Mon Nov 24 15:12:47 2014
+-nick at calyx dot com, The Calyx Institute, US, United States, North America, TRUE, FALSE, No, http://tor.calyxinstitute.org, https://tor.calyxinstitute.org, , , http://tor.calyxinstitute.org/dist/, https://tor.calyxinstitute.org/dist/, , http://tmdrhl4e4anhsjc5.onion, Mon Nov 24 15:12:47 2014
+opi(a)zeropi.net, Tor Supporter, FR, France, FR, TRUE, TRUE, No, http://tor-mirror.zeropi.net/, , , , http://tor-mirror.zeropi.net/dist/, , , , Mon Nov 24 14:22:08 2014
+noc AT bbln DOT org, BBLN, NL, The Netherlands, Europe, TRUE, TRUE, No, http://mirror-nl1.bbln.org/torproject/, https://mirror-nl1.bbln.org/torproject/, rsync://mirror-nl1.bbln.org/torproject/, ftp://mirror-nl1.bbln.org/torproject/, http://mirror-nl1.bbln.org/torproject/dist/, https://mirror-nl1.bbln.org/torproject/dist/, rsync://mirror-nl1.bbln.org/torproject/dist/, , Mon Nov 24 15:12:47 2014
+noc AT bbln DOT org, BBLN, FR, France, Europe, TRUE, TRUE, No, http://mirror-fr1.bbln.org/torproject/, https://mirror-fr1.bbln.org/torproject/, rsync://mirror-fr1.bbln.org/torproject/, ftp://mirror-fr1.bbln.org/torproject/, http://mirror-fr1.bbln.org/torproject/dist/, https://mirror-fr1.bbln.org/torproject/dist/, rsync://mirror-fr1.bbln.org/torproject/dist/, , Mon Nov 24 06:38:57 2014
+noc AT bbln DOT org, BBLN, FR, France, Europe, TRUE, TRUE, No, http://mirror-fr2.bbln.org/torproject/, https://mirror-fr2.bbln.org/torproject/, rsync://mirror-fr2.bbln.org/torproject/, ftp://mirror-fr2.bbln.org/torproject/, http://mirror-fr2.bbln.org/torproject/dist/, https://mirror-fr2.bbln.org/torproject/dist/, rsync://mirror-fr2.bbln.org/torproject/dist/, , Mon Nov 24 14:22:08 2014
+alexander AT dietrich DOT cx, Tor Supporter, DE, Germany, Europe, TRUE, TRUE, No, http://neuland.dietrich.cx/, https://neuland.dietrich.cx/, , , http://neuland.dietrich.cx/dist/, https://neuland.dietrich.cx/dist/, , , Mon Nov 24 14:22:08 2014
+tor(a)0x3d.lu, 0x3d.lu, DE, Germany, Europe, TRUE, FALSE, No, http://tor.0x3d.lu/, https://tor.0x3d.lu/, , , http://tor.0x3d.lu/dist/, https://tor.0x3d.lu/dist/, , , Mon Nov 24 06:38:57 2014
kraai(a)ftbfs.org 0xADCE6065, , SE, Sweden, Europe, TRUE, TRUE, No, http://tor.ftbfs.org/, , , , http://tor.ftbfs.org/dist/, , , , Fri Oct 24 14:28:32 2014
-kontakt(a)unicorncloud.org, UnicornCloud.org, AT, Favoriten, Wien, TRUE, TRUE, No, http://www.unicorncloud.org/public/torproject.org/, https://www.unicorncloud.org/public/torproject.org/, , , http://www.unicorncloud.org/public/torproject.org/dist, https://www.unicorncloud.org/public/torproject.org/dist, , , Wed Nov 19 15:13:39 2014
-James Murphy, intfxdx.com, US, United States, US, TRUE, TRUE, No, http://108.248.87.242/, https://108.248.87.242/, , , http://108.248.87.242/dist/, https://108.248.87.242/dist/, , , Wed Nov 19 15:13:39 2014
+kontakt(a)unicorncloud.org, UnicornCloud.org, AT, Favoriten, Wien, TRUE, TRUE, No, http://www.unicorncloud.org/public/torproject.org/, https://www.unicorncloud.org/public/torproject.org/, , , http://www.unicorncloud.org/public/torproject.org/dist, https://www.unicorncloud.org/public/torproject.org/dist, , , Mon Nov 24 06:38:57 2014
+James Murphy, intfxdx.com, US, United States, US, TRUE, TRUE, No, http://108.248.87.242/, https://108.248.87.242/, , , http://108.248.87.242/dist/, https://108.248.87.242/dist/, , , Mon Nov 24 06:38:57 2014
Sam Whited 4096R/54083AE104EA7AD3 <sam(a)samwhited.com>, SamWhited.com, US, GA, United States, TRUE, TRUE, FALSE, http://mirrors.samwhited.net/tor, https://mirrors.samwhited.net/tor, rsync://mirrors.samwhited.net/tor, , http://mirrors.samwhited.net/tor/dist, https://mirrors.samwhited.net/dist, rsync://mirrors.samwhited.net/tor-dist, , Thu Oct 9 19:32:00 2014
-rohit008 AT e DOT ntu DOT edu DOT sg, NTUOSS, SG, Singapore, Asia, TRUE, FALSE, No, http://torproject.ntuoss.com/, , , , http://torproject.ntuoss.com/dist/, , , , Wed Nov 19 15:13:39 2014
-jvictors at jessevictors dot com, Department of CS at USU, US, United States, North America, TRUE, FALSE, No, http://tor-relay.cs.usu.edu/mirrors/torproject.org/, https://www.jessevictors.com/secureMirrors/torproject.org/, , , http://tor-relay.cs.usu.edu/mirrors/torproject.org/dist/, https://www.jessevictors.com/secureMirrors/torproject.org/dist/, , , Tue Nov 18 20:29:10 2014
-justaguy AT riseup DOT net, justaguy, UK, United KIngdom, UK, TRUE, TRUE, No, http://mirrors.justaguy.pw/, , , , http://mirrors.justaguy.pw/dist/, , , , Wed Nov 19 15:13:39 2014
-Jacob Henner, Anatomical Networks, US, United States, US, TRUE, TRUE, TRUE, http://tor.ventricle.us/, , , , http://tor.ventricle.us/dist/, , , , Wed Nov 19 15:13:39 2014
-hostmaster(a)lucidnetworks.net,Lucid Networks,US,United States,US,TRUE,FALSE,No,http://tor.mirrors.lucidnetworks.net,,rsync://tor.m…,,
-hostmaster(a)vieth-server.de, mirror-server.de, DE, Germany, DE, TRUE, TRUE, No,http://tor.mirror-server.de/, , , ,http://tor.mirror-server.de/dist/, , , ,
\ No newline at end of file
+rohit008 AT e DOT ntu DOT edu DOT sg, NTUOSS, SG, Singapore, Asia, TRUE, FALSE, No, http://torproject.ntuoss.com/, , , , http://torproject.ntuoss.com/dist/, , , , Mon Nov 24 06:38:57 2014
+jvictors at jessevictors dot com, Department of CS at USU, US, United States, North America, TRUE, FALSE, No, http://tor-relay.cs.usu.edu/mirrors/torproject.org/, https://www.jessevictors.com/secureMirrors/torproject.org/, , , http://tor-relay.cs.usu.edu/mirrors/torproject.org/dist/, https://www.jessevictors.com/secureMirrors/torproject.org/dist/, , , Mon Nov 24 06:38:57 2014
+justaguy AT riseup DOT net, justaguy, UK, United KIngdom, UK, TRUE, TRUE, No, http://mirrors.justaguy.pw/, , , , http://mirrors.justaguy.pw/dist/, , , , Mon Nov 24 06:38:57 2014
+Jacob Henner, Anatomical Networks, US, United States, US, TRUE, TRUE, TRUE, http://tor.ventricle.us/, , , , http://tor.ventricle.us/dist/, , , , Mon Nov 24 06:38:57 2014
+hostmaster(a)lucidnetworks.net, Lucid Networks, US, United States, US, TRUE, FALSE, No, http://tor.mirrors.lucidnetworks.net, , rsync://tor.mirrors.lucidnetworks.net::tor, , http://tor.mirrors.lucidnetworks.net/dist, , rsync://tor.mirrors.lucidnetworks.net::tor-dist, , Sat Nov 22 15:14:24 2014
+hostmaster(a)vieth-server.de, mirror-server.de, DE, Germany, DE, TRUE, TRUE, No, http://tor.mirror-server.de/, , , , http://tor.mirror-server.de/dist/, , , , Mon Nov 24 14:22:08 2014
1
0
[webwml/master] Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml
by andrew@torproject.org 24 Nov '14
by andrew@torproject.org 24 Nov '14
24 Nov '14
commit b39fa85f3865c5672d32857aa1b4d20d6de334aa
Merge: d32bc78 cdb2483
Author: Andrew Lewman <andrew(a)torproject.is>
Date: Mon Nov 24 11:52:19 2014 -0500
Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml
projects/en/sampleproject.wml | 25 -------------------------
1 file changed, 25 deletions(-)
1
0
[tor-messenger-build/master] Add patch to fix instantbird build with mingw
by boklm@torproject.org 24 Nov '14
by boklm@torproject.org 24 Nov '14
24 Nov '14
commit 0d92193bbc30bd90d50777ad7b8e93ece5a8917f
Author: Nicolas Vigier <boklm(a)torproject.org>
Date: Mon Nov 24 17:21:27 2014 +0100
Add patch to fix instantbird build with mingw
---
projects/instantbird/config | 2 +
projects/instantbird/fix-mingw-build.patch | 71 ++++++++++++++++++++++++++++
2 files changed, 73 insertions(+)
diff --git a/projects/instantbird/config b/projects/instantbird/config
index e7c8b61..41e2522 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -64,6 +64,8 @@ input_files:
- filename: prepare-messages-for-displaying.patch
- filename: fix-mingw-build.nsprpatch
enable: '[% c("var/windows") %]'
+ - filename: fix-mingw-build.patch
+ enable: '[% c("var/windows") %]'
- filename: 'mozconfig-[% c("var/osname") %]'
name: mozconfig
- name: python
diff --git a/projects/instantbird/fix-mingw-build.patch b/projects/instantbird/fix-mingw-build.patch
new file mode 100644
index 0000000..7eefc39
--- /dev/null
+++ b/projects/instantbird/fix-mingw-build.patch
@@ -0,0 +1,71 @@
+diff --git a/im/Makefile.in b/im/Makefile.in
+index 048ef94facc1..71d1a3409c79 100644
+--- a/im/Makefile.in
++++ b/im/Makefile.in
+@@ -12,7 +12,7 @@ include $(topsrcdir)/config/config.mk
+
+ include $(topsrcdir)/config/rules.mk
+
+-ifeq ($(OS_ARCH),WINNT)
++ifdef MAKENSISU
+ # For Windows build the uninstaller during the application build since the
+ # uninstaller is included with the application for mar file generation.
+ libs::
+diff --git a/im/installer/package-manifest.in b/im/installer/package-manifest.in
+index 12397ff741fc..27d581f53c97 100644
+--- a/im/installer/package-manifest.in
++++ b/im/installer/package-manifest.in
+@@ -52,7 +52,7 @@
+ @RESPATH@/searchplugins/*
+ @RESPATH@/dictionaries/*
+ @RESPATH@/hyphenation/*
+-#ifdef XP_WIN32
++#ifdef MAKENSISU
+ @BINPATH@/uninstall/helper.exe
+ #endif
+ #ifdef MOZ_UPDATER
+@@ -123,6 +123,8 @@
+ #endif
+
+ #endif # MOZ_ANGLE_RENDERER
++
++#ifdef USE_ICU
+ #ifndef MOZ_NATIVE_ICU
+ #ifdef MOZ_SHARED_ICU
+ #ifdef XP_WIN
+@@ -140,6 +142,7 @@
+ #endif
+ #endif
+ #endif
++#endif
+
+ ; Modules
+ @RESPATH@/modules/*
+@@ -585,6 +588,7 @@
+ @RESPATH@/components/pippki.xpt
+
+ ; For process sandboxing
++#if defined(MOZ_SANDBOX)
+ #if defined(XP_WIN)
+ @BINPATH@/@DLL_PREFIX@sandboxbroker@DLL_SUFFIX@
+ #elif defined(XP_LINUX)
+@@ -592,6 +596,7 @@
+ @BINPATH@/@DLL_PREFIX@mozsandbox@DLL_SUFFIX@
+ #endif
+ #endif
++#endif
+
+ ; for Solaris SPARC
+ #ifdef SOLARIS
+diff --git a/im/moz.build b/im/moz.build
+index 0778269ffe22..528fb6e371e6 100644
+--- a/im/moz.build
++++ b/im/moz.build
+@@ -16,6 +16,6 @@ DIRS += [
+ # app is always last as it packages up the built files on mac.
+ DIRS += ['app']
+
+-if CONFIG['OS_ARCH'] == 'WINNT':
++if CONFIG['MAKENSISU']:
+ DIRS += ['installer/windows']
+
1
0