October 2014 - tor-commits - lists.torproject.org

[translation-tools/master] Remove tsum resource from config file, and cronjob
by colin＠torproject.org 28 Oct '14

28 Oct '14

commit e77fa85ead12344b3c6fdce94f4e221caec2de81 Author: Colin Childs <colin(a)torproject.org> Date: Tue Oct 28 13:09:16 2014 -0500 Remove tsum resource from config file, and cronjob --- config | 2 +- crontab | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/config b/config index 501e818..d768684 100644 --- a/config +++ b/config @@ -8,7 +8,7 @@ TRANSLATION_REPO=/srv/translation.torproject.org/translations/ TX=/usr/bin/tx PROJECTS="bridgedb bridgedb_completed gettor gettor_completed -tsum tsum_completed torcheck torcheck_completed whisperback +torcheck torcheck_completed whisperback whisperback_completed https_everywhere https_everywhere_completed liveusb-creator liveusb-creator_completed tails-persistence-setup tails-persistence-setup_completed tails-greeter tails-greeter_completed diff --git a/crontab b/crontab index f87549f..c8f4d46 100644 --- a/crontab +++ b/crontab @@ -1,6 +1,3 @@ MAILTO=sebastian(a)torproject.org 15,45 * * * * /srv/translation.torproject.org/tools/update_translations -#MAILTO=runa(a)torproject.org -MAILTO=colin(a)torproject.org -10,40 * * * * /srv/translation.torproject.org/tools/mail_tsum_completed

1 0

[tor/master] Fix smartlist_choose_node_by_bandwidth() so that it rejects ORs with BadExit flag.
by nickm＠torproject.org 28 Oct '14

28 Oct '14

commit f1ebe6bda4f541a54648d02e2d51fc9073c3786d Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Oct 26 20:56:15 2014 +0200 Fix smartlist_choose_node_by_bandwidth() so that it rejects ORs with BadExit flag. --- changes/bug13066 | 4 ++++ src/or/or.h | 8 ++++++++ src/or/routerlist.c | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/changes/bug13066 b/changes/bug13066 new file mode 100644 index 0000000..388c999 --- /dev/null +++ b/changes/bug13066 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Fix node selection logic in smartlist_choose_node_by_bandwidth() + so that onion routers with BadExit flag are not considered to be + worthy candidates. Fixes issue 13066. diff --git a/src/or/or.h b/src/or/or.h index 115b92d..2c79c13 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3228,6 +3228,14 @@ static const or_circuit_t *CONST_TO_OR_CIRCUIT(const circuit_t *); static origin_circuit_t *TO_ORIGIN_CIRCUIT(circuit_t *); static const origin_circuit_t *CONST_TO_ORIGIN_CIRCUIT(const circuit_t *); +/** Return 1 iff <b>node</b> has Exit flag and no BadExit flag. + * Otherwise, return 0. + */ +static INLINE int node_is_good_exit(const node_t *node) +{ + return node->is_exit && ! node->is_bad_exit; +} + static INLINE or_circuit_t *TO_OR_CIRCUIT(circuit_t *x) { tor_assert(x->magic == OR_CIRCUIT_MAGIC); diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 4d117cb..642b971 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2202,7 +2202,7 @@ smartlist_choose_node_by_bandwidth(const smartlist_t *sl, uint32_t this_bw = 0; i = node_sl_idx; - is_exit = node->is_exit; + is_exit = node_is_good_exit(node); is_guard = node->is_possible_guard; if (node->rs) { if (node->rs->has_bandwidth) {

1 0

[tor/master] Congratulate relay operator when OR is first started
by nickm＠torproject.org 28 Oct '14

28 Oct '14

commit 36e771628eb77f9eb4101517b761c8dc652ff037 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Oct 26 21:51:35 2014 +0200 Congratulate relay operator when OR is first started When Tor first generates identity keypair, emit a log message that thanks for their participation and points to new Tor relay lifecycle document. --- changes/ticket10427 | 4 ++++ src/or/router.c | 21 +++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/changes/ticket10427 b/changes/ticket10427 new file mode 100644 index 0000000..66af284 --- /dev/null +++ b/changes/ticket10427 @@ -0,0 +1,4 @@ + o Minor features: + - When identity keypair is generated for first time, log a + congratulatory message that points to new relay lifecycle + document. Implements feature 10427. diff --git a/src/or/router.c b/src/or/router.c index bbbf9c4..b202554 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -381,6 +381,26 @@ rotate_onion_key(void) tor_free(fname_prev); } +/** Log greeting message that points to new relay lifecycle document the + * first time this function has been called. + */ +static void +log_new_relay_greeting(void) +{ + static int already_logged = 0; + + if (already_logged) + return; + + tor_log(LOG_NOTICE, LD_GENERAL, "You are running a new relay. " + "Thanks for helping the Tor network! If you wish to know " + "what will happen in the upcoming weeks regarding its usage, " + "have a look at https://blog.torproject.org/blog/lifecycle-of" + "-a-new-relay"); + + already_logged = 1; +} + /** Try to read an RSA key from <b>fname</b>. If <b>fname</b> doesn't exist * and <b>generate</b> is true, create a new RSA key and save it in * <b>fname</b>. Return the read/created key, or NULL on error. Log all @@ -425,6 +445,7 @@ init_key_from_file(const char *fname, int generate, int severity) goto error; } log_info(LD_GENERAL, "Generated key seems valid"); + log_new_relay_greeting(); if (crypto_pk_write_private_key_to_filename(prkey, fname)) { tor_log(severity, LD_FS, "Couldn't write generated key to \"%s\".", fname);

1 0

[tor/master] Merge remote-tracking branch 'rl1987/feature10427'
by nickm＠torproject.org 28 Oct '14

28 Oct '14

commit 2c884fd8cc0a7a8c42003e10b5033deb5a7d6d99 Merge: 0793ef8 36e7716 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 28 14:03:40 2014 -0400 Merge remote-tracking branch 'rl1987/feature10427' changes/ticket10427 | 4 ++++ src/or/router.c | 21 +++++++++++++++++++++ 2 files changed, 25 insertions(+)

1 0

[stem/master] Revisions for new hidden service methods
by atagar＠torproject.org 28 Oct '14

28 Oct '14

commit 2446babb8d03fb58d44ccec7cb333afd472c9395 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Oct 28 10:07:42 2014 -0700 Revisions for new hidden service methods Lots of changes for the patch from... https://trac.torproject.org/projects/tor/ticket/12533 Some that come to mind... * Revised pydocs, added header entries, and updated the changelog. * Reordered the new methods to be in their own grouping. * Renamed get_hidden_services_conf and set_hidden_services_conf to drop the plural. * Renamed deleted_hidden_service to remove_hidden_service (since we're not actually deleting anything). * Making create_hidden_service and remove_hidden_service be idempotent, returning a boolean to indicate if they did anything or not. * Dropping hidden services after our integ tests are done. --- docs/change_log.rst | 1 + stem/control.py | 357 ++++++++++++++++++++------------------ test/integ/control/controller.py | 106 +++++------ 3 files changed, 244 insertions(+), 220 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 7297cb9..369806a 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -42,6 +42,7 @@ The following are only available within Stem's `git repository * **Controller** + * Added :class:`~stem.control.Controller` methods to more easily work with hidden service configurations: :func:`~stem.control.Controller.get_hidden_service_conf`, :func:`~stem.control.Controller.set_hidden_service_conf`, :func:`~stem.control.Controller.create_hidden_service`, and :func:`~stem.control.Controller.remove_hidden_service` (feature by federico3 and patrickod, :trac:`12533`) * Added :func:`~stem.control.Controller.get_accounting_stats` to the :class:`~stem.control.Controller` * Added :func:`~stem.control.Controller.get_effective_rate` to the :class:`~stem.control.Controller` * Added :func:`~stem.control.BaseController.connection_time` to the :class:`~stem.control.BaseController` diff --git a/stem/control.py b/stem/control.py index 1282eb3..93fe354 100644 --- a/stem/control.py +++ b/stem/control.py @@ -95,6 +95,11 @@ If you're fine with allowing your script to raise exceptions then this can be mo |- reset_conf - reverts configuration options to their default values |- set_options - sets or resets the values of multiple configuration options | + |- get_hidden_service_conf - provides our hidden service configuration + |- set_hidden_service_conf - sets our hidden service configuration + |- create_hidden_service - creates a new hidden service or adds a new port + |- remove_hidden_service - removes a hidden service or drops a port + | |- add_event_listener - attaches an event listener to be notified of tor events |- remove_event_listener - removes a listener so it isn't notified of further events | @@ -1894,174 +1899,6 @@ class Controller(BaseController): else: raise exc - def get_hidden_services_conf(self, default = UNDEFINED): - """ - This provides a mapping of hidden service directories to their - attribute's key/value pairs. - - { - "/var/lib/tor/hidden_service_empty/": { - "HiddenServicePort": [ - ] - }, - "/var/lib/tor/hidden_service_with_two_ports/": { - "HiddenServiceAuthorizeClient": "stealth a, b", - "HiddenServicePort": [ - "8020 127.0.0.1:8020", # the ports order is kept - "8021 127.0.0.1:8021" - ], - "HiddenServiceVersion": "2" - }, - } - - :raises: - * :class:`stem.ControllerError` if the call fails and we weren't provided - a default response - """ - start_time = time.time() - - try: - response = self.msg('GETCONF HiddenServiceOptions') - stem.response.convert('GETCONF', response) - log.debug('GETCONF HiddenServiceOptions (runtime: %0.4f)' % - (time.time() - start_time)) - except stem.ControllerError as exc: - log.debug('GETCONF HiddenServiceOptions (failed: %s)' % exc) - if default != UNDEFINED: - return default - else: - raise exc - - service_dir_map = OrderedDict() - directory = None - - for status_code, divider, content in response.content(): - if content == 'HiddenServiceOptions': - continue - - if not "=" in content: - continue - - k, v = content.split('=', 1) - - if k == 'HiddenServiceDir': - directory = v - service_dir_map[directory] = {'HiddenServicePort': []} - - elif k == 'HiddenServicePort': - service_dir_map[directory]['HiddenServicePort'].append(v) - - else: - service_dir_map[directory][k] = v - - return service_dir_map - - def set_hidden_services_conf(self, conf): - """Update all the configured hidden services from a dictionary having - the same format as the output of get_hidden_services_conf() - - :param dict conf: configuration dictionary - - :raises: - * :class:`stem.ControllerError` if the call fails - * :class:`stem.InvalidArguments` if configuration options - requested was invalid - * :class:`stem.InvalidRequest` if the configuration setting is - impossible or if there's a syntax error in the configuration values - * :raises: - """ - - # Convert conf dictionary into a list of ordered config tuples - hidden_service_options = [] - for directory in conf: - hidden_service_options.append(('HiddenServiceDir', directory)) - for k, v in conf[directory].iteritems(): - if k == 'HiddenServicePort': - for port in v: - hidden_service_options.append(('HiddenServicePort', port)) - else: - hidden_service_options.append((k, str(v))) - self.set_options(hidden_service_options) - - def create_new_hidden_service(self, dirname, virtport, target=None): - """Create a new hidden service+port. If the directory is already present, a - new port will be added. If the port is already present, return False. - - :param str dirname: directory name - :param int virtport: virtual port - :param str target: optional ipaddr:port target e.g. '127.0.0.1:8080' - :returns: False if the hidden service and port is already in place - True if the creation is successful - """ - if stem.util.connection.is_valid_port(virtport): - virtport = int(virtport) - - else: - raise ValueError("%s isn't a valid port number" % virtport) - - conf = self.get_hidden_services_conf() - - if dirname in conf: - ports = conf[dirname]['HiddenServicePort'] - if target is None: - if str(virtport) in ports: - return False - - if "%d 127.0.0.1:%d" % (virtport, virtport) in ports: - return False - - elif "%d %s" % (virtport, target) in ports: - return False - - else: - conf[dirname] = {'HiddenServicePort': []} - - if target is None: - conf[dirname]['HiddenServicePort'].append("%d" % virtport) - - else: - conf[dirname]['HiddenServicePort'].append("%d %s" % (virtport, target)) - - self.set_hidden_services_conf(conf) - return True - - def delete_hidden_service(self, dirname, virtport, target=None): - """Delete a hidden service+port. - :param str dirname: directory name - :param int virtport: virtual port - :param str target: optional ipaddr:port target e.g. '127.0.0.1:8080' - :raises: - """ - if stem.util.connection.is_valid_port(virtport): - virtport = int(virtport) - - else: - raise ValueError("%s isn't a valid port number" % virtport) - - conf = self.get_hidden_services_conf() - - if dirname not in conf: - raise RuntimeError("HiddenServiceDir %r not found" % dirname) - - ports = conf[dirname]['HiddenServicePort'] - - if target is None: - longport = "%d 127.0.0.1:%d" % (virtport, virtport) - try: - ports.pop(ports.index(str(virtport))) - except ValueError: - raise stem.InvalidArguments - - else: - longport = "%d %s" % (virtport, target) - ports.pop(ports.index(longport)) - - if not ports: - del(conf[dirname]) - - self.set_hidden_services_conf(conf) - return True - def _get_conf_dict_to_response(self, config_dict, default, multiple): """ Translates a dictionary of 'config key => [value1, value2...]' into the @@ -2205,6 +2042,190 @@ class Controller(BaseController): else: raise stem.ProtocolError('Returned unexpected status code: %s' % response.code) + def get_hidden_service_conf(self, default = UNDEFINED): + """ + This provides a mapping of hidden service directories to their + attribute's key/value pairs. All hidden services are assured to have a + 'HiddenServicePort', but other entries may or may not exist. + + :: + + { + "/var/lib/tor/hidden_service_empty/": { + "HiddenServicePort": [ + ] + }, + "/var/lib/tor/hidden_service_with_two_ports/": { + "HiddenServiceAuthorizeClient": "stealth a, b", + "HiddenServicePort": [ + "8020 127.0.0.1:8020", # the ports order is kept + "8021 127.0.0.1:8021" + ], + "HiddenServiceVersion": "2" + }, + } + + :param object default: response if the query fails + + :returns: **dict** with the hidden service configuration + + :raises: :class:`stem.ControllerError` if the call fails and we weren't + provided a default response + """ + + start_time = time.time() + + try: + response = self.msg('GETCONF HiddenServiceOptions') + stem.response.convert('GETCONF', response) + log.debug('GETCONF HiddenServiceOptions (runtime: %0.4f)' % + (time.time() - start_time)) + except stem.ControllerError as exc: + log.debug('GETCONF HiddenServiceOptions (failed: %s)' % exc) + + if default != UNDEFINED: + return default + else: + raise exc + + service_dir_map = OrderedDict() + directory = None + + for status_code, divider, content in response.content(): + if content == 'HiddenServiceOptions': + continue + + if '=' not in content: + continue + + k, v = content.split('=', 1) + + if k == 'HiddenServiceDir': + directory = v + service_dir_map[directory] = {'HiddenServicePort': []} + elif k == 'HiddenServicePort': + service_dir_map[directory]['HiddenServicePort'].append(v) + else: + service_dir_map[directory][k] = v + + return service_dir_map + + def set_hidden_service_conf(self, conf): + """ + Update all the configured hidden services from a dictionary having + the same format as + :func:`~stem.control.Controller.get_hidden_service_conf`. + + :param dict conf: configuration dictionary + + :raises: + * :class:`stem.ControllerError` if the call fails + * :class:`stem.InvalidArguments` if configuration options + requested was invalid + * :class:`stem.InvalidRequest` if the configuration setting is + impossible or if there's a syntax error in the configuration values + """ + + # Convert conf dictionary into a list of ordered config tuples + + hidden_service_options = [] + + for directory in conf: + hidden_service_options.append(('HiddenServiceDir', directory)) + + for k, v in conf[directory].items(): + if k == 'HiddenServicePort': + for port in v: + hidden_service_options.append(('HiddenServicePort', port)) + else: + hidden_service_options.append((k, str(v))) + + self.set_options(hidden_service_options) + + def create_hidden_service(self, path, port, target = None): + """ + Create a new hidden service. If the directory is already present, a + new port is added. + + :param str path: path for the hidden service's data directory + :param int port: hidden service port + :param str target: optional ipaddr:port target e.g. '127.0.0.1:8080' + + :returns: **True** if the hidden service is created, **False** if the + hidden service port is already in use + + :raises: :class:`stem.ControllerError` if the call fails + """ + + if not stem.util.connection.is_valid_port(port): + raise ValueError("%s isn't a valid port number" % port) + + port, conf = str(port), self.get_hidden_service_conf() + + if path in conf: + ports = conf[path]['HiddenServicePort'] + + if target is None: + if port in ports or '%s 127.0.0.1:%s' % (port, port) in ports: + return False + elif '%s %s' % (port, target) in ports: + return False + else: + conf[path] = {'HiddenServicePort': []} + + conf[path]['HiddenServicePort'].append('%s %s' % (port, target) if target else port) + self.set_hidden_service_conf(conf) + + return True + + def remove_hidden_service(self, path, port = None, target = None): + """ + Discontinues a given hidden service. + + :param str path: path for the hidden service's data directory + :param int port: hidden service port + :param str target: optional ipaddr:port target e.g. '127.0.0.1:8080' + + :returns: **True** if the hidden service is discontinued, **False** if it + wasn't running in the first place + + :raises: :class:`stem.ControllerError` if the call fails + """ + + if not stem.util.connection.is_valid_port(port): + raise ValueError("%s isn't a valid port number" % port) + + port, conf = str(port), self.get_hidden_service_conf() + + if path not in conf: + return False + + if port: + if not target: + longport = '%s 127.0.0.1:%s' % (port, port) + + if port in conf[path]['HiddenServicePort']: + conf[path]['HiddenServicePort'].remove(port) + elif longport in conf[path]['HiddenServicePort']: + conf[path]['HiddenServicePort'].remove(longport) + else: + return False # wasn't configured to be a hidden service + else: + longport = '%s %s' % (port, target) + + if longport in conf[path]['HiddenServicePort']: + conf[path]['HiddenServicePort'].remove(longport) + else: + return False # wasn't configured to be a hidden service + + if not conf[path]['HiddenServicePort']: + del(conf[path]) # no ports left, drop it entirely + else: + del(conf[path]) + + self.set_hidden_service_conf(conf) + return True + def add_event_listener(self, listener, *events): """ Directs further tor controller events to a given function. The function is diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 4935043..1f20f9f 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -457,7 +457,8 @@ class TestController(unittest.TestCase): def test_hidden_services_conf(self): """ - Exercises get_hidden_services_conf with valid and invalid queries. + Exercises the hidden service family of methods (get_hidden_service_conf, + set_hidden_service_conf, create_hidden_service, and remove_hidden_service). """ if test.runner.require_control(self): @@ -466,67 +467,68 @@ class TestController(unittest.TestCase): runner = test.runner.get_runner() with runner.get_tor_controller() as controller: - - conf = controller.get_hidden_services_conf() - self.assertDictEqual({}, conf) - controller.set_hidden_services_conf(conf) - - initialconf = { - "test_hidden_service1/": { - "HiddenServicePort": [ - "8020 127.0.0.1:8020", - "8021 127.0.0.1:8021" - ], - "HiddenServiceVersion": "2", - }, - "test_hidden_service2/": { - "HiddenServiceAuthorizeClient": "stealth a, b", - "HiddenServicePort": [ - "8030 127.0.0.1:8030", - "8031 127.0.0.1:8031", - "8032 127.0.0.1:8032" - ] - }, - "test_hidden_service_empty/": { - "HiddenServicePort": [] + try: + # initially we shouldn't be running any hidden services + + self.assertDictEqual({}, controller.get_hidden_service_conf()) + + # try setting a blank config, shouldn't have any impact + + controller.set_hidden_service_conf({}) + self.assertDictEqual({}, controller.get_hidden_service_conf()) + + # create a hidden service + + initialconf = { + 'test_hidden_service1/': { + 'HiddenServicePort': [ + '8020 127.0.0.1:8020', + '8021 127.0.0.1:8021', + ], + 'HiddenServiceVersion': '2', + }, + 'test_hidden_service2/': { + 'HiddenServiceAuthorizeClient': 'stealth a, b', + 'HiddenServicePort': [ + '8030 127.0.0.1:8030', + '8031 127.0.0.1:8031', + '8032 127.0.0.1:8032', + ] + }, + 'test_hidden_service_empty/': { + 'HiddenServicePort': [] + } } - } - controller.set_hidden_services_conf(initialconf) - conf = controller.get_hidden_services_conf() - self.assertDictEqual(initialconf, dict(conf)) + controller.set_hidden_service_conf(initialconf) + self.assertDictEqual(initialconf, controller.get_hidden_service_conf()) - # Add already existing services, with/without explicit target - r = controller.create_new_hidden_service('test_hidden_service1/', 8020) - self.assertFalse(r) - r = controller.create_new_hidden_service('test_hidden_service1/', 8021, target="127.0.0.1:8021") - self.assertFalse(r) + # add already existing services, with/without explicit target - # Add new services, with/without explicit target - r = controller.create_new_hidden_service('test_hidden_serviceX/', 8888) - self.assertTrue(r) - r = controller.create_new_hidden_service('test_hidden_serviceX/', 8989, target="127.0.0.1:8021") - self.assertTrue(r) + self.assertFalse(controller.create_hidden_service('test_hidden_service1/', 8020)) + self.assertFalse(controller.create_hidden_service('test_hidden_service1/', 8021, target = '127.0.0.1:8021')) + self.assertDictEqual(initialconf, controller.get_hidden_service_conf()) - conf = controller.get_hidden_services_conf() - self.assertEqual(len(conf), 4) - ports = conf['test_hidden_serviceX/']['HiddenServicePort'] - self.assertEqual(len(ports), 2) + # add a new service, with/without explicit target - # Delete services - controller.delete_hidden_service('test_hidden_serviceX/', 8888) + self.assertTrue(controller.create_hidden_service('test_hidden_serviceX/', 8888)) + self.assertTrue(controller.create_hidden_service('test_hidden_serviceX/', 8989, target = '127.0.0.1:8021')) - # The service dir should be still there - conf = controller.get_hidden_services_conf() - self.assertEqual(len(conf), 4) + conf = controller.get_hidden_service_conf() + self.assertEqual(4, len(conf)) + self.assertEqual(2, len(conf['test_hidden_serviceX/']['HiddenServicePort'])) - # Delete service - controller.delete_hidden_service('test_hidden_serviceX/', 8989, target="127.0.0.1:8021") + # remove a hidden service, the service dir should still be there - # The service dir should be gone - conf = controller.get_hidden_services_conf() - self.assertEqual(len(conf), 3) + controller.remove_hidden_service('test_hidden_serviceX/', 8888) + self.assertEqual(4, len(controller.get_hidden_service_conf())) + # remove a service completely, it should now be gone + + controller.remove_hidden_service('test_hidden_serviceX/', 8989, target = '127.0.0.1:8021') + self.assertEqual(3, len(controller.get_hidden_service_conf())) + finally: + controller.set_hidden_service_conf({}) # drop hidden services created during the test def test_set_conf(self): """

1 0

[stem/master] Better support for multiple hidden services
by atagar＠torproject.org 28 Oct '14

28 Oct '14

commit 1294934aa8b2d0bf6bf25ed081ddc54537fad939 Author: Patrick O'Doherty <p(a)trickod.com> Date: Mon Oct 27 19:56:04 2014 -0700 Better support for multiple hidden services Adds the following Controller methods for manipulating hidden services. * get_hidden_services_conf * set_hidden_services_conf * create_new_hidden_service * delete_hidden_service Fixes issue #12533 where creating new hidden service would clobber the configuration for existing services --- stem/control.py | 174 ++++++++++++++++++++++++++++++++++++++ test/integ/control/controller.py | 73 ++++++++++++++++ 2 files changed, 247 insertions(+) diff --git a/stem/control.py b/stem/control.py index ed83a00..1282eb3 100644 --- a/stem/control.py +++ b/stem/control.py @@ -224,6 +224,12 @@ import StringIO import threading import time +try: + # Added in 2.7 + from collections import OrderedDict +except ImportError: + from stem.util.ordereddict import OrderedDict + import stem.descriptor.microdescriptor import stem.descriptor.reader import stem.descriptor.router_status_entry @@ -1888,6 +1894,174 @@ class Controller(BaseController): else: raise exc + def get_hidden_services_conf(self, default = UNDEFINED): + """ + This provides a mapping of hidden service directories to their + attribute's key/value pairs. + + { + "/var/lib/tor/hidden_service_empty/": { + "HiddenServicePort": [ + ] + }, + "/var/lib/tor/hidden_service_with_two_ports/": { + "HiddenServiceAuthorizeClient": "stealth a, b", + "HiddenServicePort": [ + "8020 127.0.0.1:8020", # the ports order is kept + "8021 127.0.0.1:8021" + ], + "HiddenServiceVersion": "2" + }, + } + + :raises: + * :class:`stem.ControllerError` if the call fails and we weren't provided + a default response + """ + start_time = time.time() + + try: + response = self.msg('GETCONF HiddenServiceOptions') + stem.response.convert('GETCONF', response) + log.debug('GETCONF HiddenServiceOptions (runtime: %0.4f)' % + (time.time() - start_time)) + except stem.ControllerError as exc: + log.debug('GETCONF HiddenServiceOptions (failed: %s)' % exc) + if default != UNDEFINED: + return default + else: + raise exc + + service_dir_map = OrderedDict() + directory = None + + for status_code, divider, content in response.content(): + if content == 'HiddenServiceOptions': + continue + + if not "=" in content: + continue + + k, v = content.split('=', 1) + + if k == 'HiddenServiceDir': + directory = v + service_dir_map[directory] = {'HiddenServicePort': []} + + elif k == 'HiddenServicePort': + service_dir_map[directory]['HiddenServicePort'].append(v) + + else: + service_dir_map[directory][k] = v + + return service_dir_map + + def set_hidden_services_conf(self, conf): + """Update all the configured hidden services from a dictionary having + the same format as the output of get_hidden_services_conf() + + :param dict conf: configuration dictionary + + :raises: + * :class:`stem.ControllerError` if the call fails + * :class:`stem.InvalidArguments` if configuration options + requested was invalid + * :class:`stem.InvalidRequest` if the configuration setting is + impossible or if there's a syntax error in the configuration values + * :raises: + """ + + # Convert conf dictionary into a list of ordered config tuples + hidden_service_options = [] + for directory in conf: + hidden_service_options.append(('HiddenServiceDir', directory)) + for k, v in conf[directory].iteritems(): + if k == 'HiddenServicePort': + for port in v: + hidden_service_options.append(('HiddenServicePort', port)) + else: + hidden_service_options.append((k, str(v))) + self.set_options(hidden_service_options) + + def create_new_hidden_service(self, dirname, virtport, target=None): + """Create a new hidden service+port. If the directory is already present, a + new port will be added. If the port is already present, return False. + + :param str dirname: directory name + :param int virtport: virtual port + :param str target: optional ipaddr:port target e.g. '127.0.0.1:8080' + :returns: False if the hidden service and port is already in place + True if the creation is successful + """ + if stem.util.connection.is_valid_port(virtport): + virtport = int(virtport) + + else: + raise ValueError("%s isn't a valid port number" % virtport) + + conf = self.get_hidden_services_conf() + + if dirname in conf: + ports = conf[dirname]['HiddenServicePort'] + if target is None: + if str(virtport) in ports: + return False + + if "%d 127.0.0.1:%d" % (virtport, virtport) in ports: + return False + + elif "%d %s" % (virtport, target) in ports: + return False + + else: + conf[dirname] = {'HiddenServicePort': []} + + if target is None: + conf[dirname]['HiddenServicePort'].append("%d" % virtport) + + else: + conf[dirname]['HiddenServicePort'].append("%d %s" % (virtport, target)) + + self.set_hidden_services_conf(conf) + return True + + def delete_hidden_service(self, dirname, virtport, target=None): + """Delete a hidden service+port. + :param str dirname: directory name + :param int virtport: virtual port + :param str target: optional ipaddr:port target e.g. '127.0.0.1:8080' + :raises: + """ + if stem.util.connection.is_valid_port(virtport): + virtport = int(virtport) + + else: + raise ValueError("%s isn't a valid port number" % virtport) + + conf = self.get_hidden_services_conf() + + if dirname not in conf: + raise RuntimeError("HiddenServiceDir %r not found" % dirname) + + ports = conf[dirname]['HiddenServicePort'] + + if target is None: + longport = "%d 127.0.0.1:%d" % (virtport, virtport) + try: + ports.pop(ports.index(str(virtport))) + except ValueError: + raise stem.InvalidArguments + + else: + longport = "%d %s" % (virtport, target) + ports.pop(ports.index(longport)) + + if not ports: + del(conf[dirname]) + + self.set_hidden_services_conf(conf) + return True + def _get_conf_dict_to_response(self, config_dict, default, multiple): """ Translates a dictionary of 'config key => [value1, value2...]' into the diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 05ce3f7..4935043 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -455,6 +455,79 @@ class TestController(unittest.TestCase): self.assertEqual({}, controller.get_conf_map('', 'la-di-dah')) self.assertEqual({}, controller.get_conf_map([], 'la-di-dah')) + def test_hidden_services_conf(self): + """ + Exercises get_hidden_services_conf with valid and invalid queries. + """ + + if test.runner.require_control(self): + return + + runner = test.runner.get_runner() + + with runner.get_tor_controller() as controller: + + conf = controller.get_hidden_services_conf() + self.assertDictEqual({}, conf) + controller.set_hidden_services_conf(conf) + + initialconf = { + "test_hidden_service1/": { + "HiddenServicePort": [ + "8020 127.0.0.1:8020", + "8021 127.0.0.1:8021" + ], + "HiddenServiceVersion": "2", + }, + "test_hidden_service2/": { + "HiddenServiceAuthorizeClient": "stealth a, b", + "HiddenServicePort": [ + "8030 127.0.0.1:8030", + "8031 127.0.0.1:8031", + "8032 127.0.0.1:8032" + ] + }, + "test_hidden_service_empty/": { + "HiddenServicePort": [] + } + } + controller.set_hidden_services_conf(initialconf) + + conf = controller.get_hidden_services_conf() + self.assertDictEqual(initialconf, dict(conf)) + + # Add already existing services, with/without explicit target + r = controller.create_new_hidden_service('test_hidden_service1/', 8020) + self.assertFalse(r) + r = controller.create_new_hidden_service('test_hidden_service1/', 8021, target="127.0.0.1:8021") + self.assertFalse(r) + + # Add new services, with/without explicit target + r = controller.create_new_hidden_service('test_hidden_serviceX/', 8888) + self.assertTrue(r) + r = controller.create_new_hidden_service('test_hidden_serviceX/', 8989, target="127.0.0.1:8021") + self.assertTrue(r) + + conf = controller.get_hidden_services_conf() + self.assertEqual(len(conf), 4) + ports = conf['test_hidden_serviceX/']['HiddenServicePort'] + self.assertEqual(len(ports), 2) + + # Delete services + controller.delete_hidden_service('test_hidden_serviceX/', 8888) + + # The service dir should be still there + conf = controller.get_hidden_services_conf() + self.assertEqual(len(conf), 4) + + # Delete service + controller.delete_hidden_service('test_hidden_serviceX/', 8989, target="127.0.0.1:8021") + + # The service dir should be gone + conf = controller.get_hidden_services_conf() + self.assertEqual(len(conf), 3) + + def test_set_conf(self): """ Exercises set_conf(), reset_conf(), and set_options() methods with valid

1 0

[webwml/staging] Add some comments to include/blog-recent.wmi
by weasel＠torproject.org 28 Oct '14

28 Oct '14

commit bc93fae410a7c23b1803fde8eb99ed48c5630805 Author: Peter Palfrader <peter(a)palfrader.org> Date: Tue Oct 28 15:34:36 2014 +0100 Add some comments to include/blog-recent.wmi --- include/blog-recent.wmi | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/blog-recent.wmi b/include/blog-recent.wmi index 25f6974..92bc046 100644 --- a/include/blog-recent.wmi +++ b/include/blog-recent.wmi @@ -1,2 +1,11 @@ <div class='blogRow blogRow1'> <br /><p class='blogDate' style=\"text-align:center;color:\#999;line-height:16px;\"><em>Recent posts are temporarily unavailable</em></p></div> +

1 0

[webwml/staging] update .gitignore
by weasel＠torproject.org 28 Oct '14

28 Oct '14

commit bd4b46d86cf9f6ef8a0b5ccb1e8b04a0b17d88c0 Author: Peter Palfrader <peter(a)palfrader.org> Date: Tue Oct 28 15:31:04 2014 +0100 update .gitignore --- .gitignore | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 4e539a7..1e06ffa 100644 --- a/.gitignore +++ b/.gitignore @@ -7,17 +7,20 @@ about/contributors.html.en about/corepeople.html.en about/financials.html.en about/gsoc.html.en -about/overview.html.en -about/sponsors.html.en -about/torusers.html.en -about/translators.html.en -about/volunteers.html.en about/jobs-browserhacker.html.en +about/jobs-controller.html.en about/jobs-coredev.html.en +about/jobs-extdev.html.en +about/jobs-lead-automation.html.en about/jobs-pluggabletransport.html.en about/jobs-projectcoordinator.html.en about/jobs-translatorsupport.html.en about/jobs.html.en +about/overview.html.en +about/sponsors.html.en +about/torusers.html.en +about/translators.html.en +about/volunteers.html.en docs/N900.html.en docs/android.html.en docs/bridges.html.en @@ -33,6 +36,7 @@ docs/pluggable-transports.html.en docs/proxychain.html.en docs/rpms.html.en docs/running-a-mirror.html.en +docs/short-user-manual.html.en docs/signing-keys.html.en docs/tor-doc-osx.html.en docs/tor-doc-relay.html.en @@ -44,6 +48,8 @@ docs/tor-hidden-service.html.en docs/tor-manual-dev.html.en docs/tor-manual.html.en docs/tor-relay-debian.html.en +docs/torbutton/torbutton-faq.html.en +docs/torbutton/torbutton-options.html.en docs/trademark-faq.html.en docs/verifying-signatures.html.en donate/become-sponsor.html.en @@ -59,8 +65,8 @@ eff/tor-dmca-response.html.en eff/tor-legal-faq.html.en getinvolved/mirrors.html.en getinvolved/open-positions.html.en -getinvolved/research.html.en getinvolved/relays.html.en +getinvolved/research.html.en getinvolved/translation-overview.html.en getinvolved/translation.html.en getinvolved/tshirt.html.en @@ -89,4 +95,3 @@ projects/vidalia.html.en torbutton/index.html.en torbutton/torbutton-faq.html.en torbutton/torbutton-options.html.en -

1 0

[webwml/master] a new mirror run
by arma＠torproject.org 28 Oct '14

28 Oct '14

commit 82baba6473d9220776c09c08982d8fe0f8d0f437 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Oct 28 09:40:49 2014 -0400 a new mirror run i think i'm the only person to do this? --- include/mirrors-table.wmi | 272 ++++++++++++++++++++++++++++----------------- include/tor-mirrors.csv | 142 +++++++++++------------ 2 files changed, 241 insertions(+), 173 deletions(-) diff --git a/include/mirrors-table.wmi b/include/mirrors-table.wmi index 3aec4162..ef1835c 100644 --- a/include/mirrors-table.wmi +++ b/include/mirrors-table.wmi @@ -18,6 +18,23 @@ <tr> + <td>DE</td> + + <td>Tor Supporter</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.hoi-polloi.org/dist/">http</a></td> + <td><a href="http://tor.hoi-polloi.org">http</a></td> + <td><a href="http://tor.hosi-polloi.org/dist/">https</a></td> + <td><a href="http://tor.hossi-polloiorg">https</a></td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>NO</td> <td>MultiNet AS</td> @@ -35,15 +52,15 @@ <tr> - <td>US</td> + <td>EE</td> - <td>Tor Supporter</td> + <td>CyberSIDE</td> <td>Up to date</td> <td> - </td> - <td><a href="http://199.175.55.215/dist/">http</a></td> - <td><a href="http://199.175.55.215/">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> @@ -52,15 +69,15 @@ <tr> - <td>EE</td> + <td>IS</td> - <td>CyberSIDE</td> + <td>torproject.is</td> <td>Up to date</td> <td> - </td> - <td><a href="http://cyberside.net.ee/tor/">http</a></td> - <td><a href="http://cyberside.planet.ee/tor/">http</a></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> @@ -103,17 +120,17 @@ <tr> - <td>MX</td> + <td>AT</td> - <td>Tor Supporter</td> + <td>TechAsk.IT</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><a href="http://www.unicorncloud.org/public/torproject.org/dist">http</a></td> + <td><a href="http://www.unicorncloud.org/public/torproject.org/">http</a></td> + <td><a href="https://www.unicorncloud.org/public/torproject.org/dist">https</a></td> + <td><a href="https://www.unicorncloud.org/public/torproject.org/">https</a></td> <td> - </td> <td> - </td> </tr> @@ -171,40 +188,6 @@ <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>torservers</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> - </td> - <td> - </td> -</tr> - -<tr> - <td>IS</td> <td>myRL.net</td> @@ -256,102 +239,119 @@ <tr> - <td>US</td> + <td>GR</td> - <td>EFF</td> + <td>Tor Supporter</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><a href="https://tor.void.gr/dist/">http</a></td> + <td><a href="https://tor.void.gr">http</a></td> + <td><a href="https://tor.void.gr/dist/">https</a></td> + <td><a href="https://tor.void.gr">https</a></td> <td> - </td> <td> - </td> </tr> <tr> - <td>GR</td> + <td>DE</td> <td>Tor Supporter</td> <td>Up to date</td> <td> - </td> - <td><a href="https://tor.void.gr/dist/">http</a></td> - <td><a href="https://tor.void.gr">http</a></td> - <td><a href="https://tor.void.gr/dist/">https</a></td> - <td><a href="https://tor.void.gr">https</a></td> + <td><a href="http://reichster.de/mirrors/torproject.org/dist/">http</a></td> + <td><a href="http://reichster.de/mirrors/torproject.org/">http</a></td> + <td><a href="https://reichster.de/mirrors/torproject.org/dist/">https</a></td> + <td><a href="https://reichster.de/mirrors/torproject.org">https</a></td> <td> - </td> <td> - </td> </tr> <tr> - <td>US</td> + <td>FR</td> - <td>Evil Routers</td> + <td>Tor Supporter</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor1.evilrouters.net/dist/">http</a></td> - <td><a href="http://tor1.evilrouters.net/">http</a></td> - <td> - </td> - <td> - </td> + <td><a href="http://tor.fr33tux.org/dist/">http</a></td> + <td><a href="http://tor.fr33tux.org">http</a></td> + <td><a href="https://tor.fr33tux.org/dist/">https</a></td> + <td><a href="https://tor.fr33tux.org">https</a></td> <td> - </td> <td> - </td> </tr> <tr> - <td>AT</td> + <td>PL</td> - <td>TorNinurtaName</td> + <td>Sebastian M. Bobrecki</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.ninurta.name/dist/">http</a></td> - <td><a href="http://tor.ninurta.name/">http</a></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> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://ayo.tl/tor/dist/">http</a></td> + <td><a href="http://ayo.tl/tor/">http</a></td> + <td><a href="https://ayo.tl/tor/dist/">https</a></td> + <td><a href="https://ayo.tl/tor/">https</a></td> <td> - </td> <td> - </td> </tr> <tr> - <td>FR</td> + <td>NL</td> - <td>Tor Supporter</td> + <td>Hackabit.nl</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.fr33tux.org/dist/">http</a></td> - <td><a href="http://tor.fr33tux.org">http</a></td> - <td><a href="https://tor.fr33tux.org/dist/">https</a></td> - <td><a href="https://tor.fr33tux.org">https</a></td> + <td><a href="http://hackabit.nl/tor/dist/">http</a></td> + <td><a href="http://hackabit.nl/tor/">http</a></td> + <td><a href="https://hackabit.nl/tor/dist/">https</a></td> + <td><a href="https://hackabit.nl/tor/">https</a></td> <td> - </td> <td> - </td> </tr> <tr> - <td>PL</td> + <td>DE</td> - <td>Sebastian M. Bobrecki</td> + <td>Tor Supporter</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><a href="http://tor.euve33747.vserver.de/dist">http</a></td> + <td><a href="http://tor.euve33747.vserver.de/">http</a></td> + <td> - </td> + <td> - </td> <td> - </td> <td> - </td> </tr> @@ -392,6 +392,23 @@ <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>Tor Supporter</td> @@ -477,68 +494,119 @@ <tr> - <td>DE</td> + <td>US</td> <td>Tor Supporter</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.hoi-polloi.org/dist/">http</a></td> - <td><a href="http://tor.hoi-polloi.org">http</a></td> - <td><a href="http://tor.hosi-polloi.org/dist/">https</a></td> - <td><a href="http://tor.hossi-polloiorg">https</a></td> + <td><a href="http://199.175.55.215/dist/">http</a></td> + <td><a href="http://199.175.55.215/">http</a></td> + <td> - </td> + <td> - </td> <td> - </td> <td> - </td> </tr> <tr> - <td>AT</td> + <td>US</td> - <td>TechAsk.IT</td> + <td>Evil Routers</td> <td>Up to date</td> <td> - </td> - <td><a href="http://www.unicorncloud.org/public/torproject.org/dist">http</a></td> - <td><a href="http://www.unicorncloud.org/public/torproject.org/">http</a></td> - <td><a href="https://www.unicorncloud.org/public/torproject.org/dist">https</a></td> - <td><a href="https://www.unicorncloud.org/public/torproject.org/">https</a></td> + <td><a href="http://tor1.evilrouters.net/dist/">http</a></td> + <td><a href="http://tor1.evilrouters.net/">http</a></td> + <td> - </td> + <td> - </td> <td> - </td> <td> - </td> </tr> <tr> - <td>IS</td> + <td>MX</td> <td>Tor Supporter</td> <td>Up to date</td> <td> - </td> - <td><a href="http://ayo.tl/tor/dist/">http</a></td> - <td><a href="http://ayo.tl/tor/">http</a></td> - <td><a href="https://ayo.tl/tor/dist/">https</a></td> - <td><a href="https://ayo.tl/tor/">https</a></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>Tor Supporter</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.linuxlounge.net/dist/">http</a></td> + <td><a href="http://tor.linuxlounge.net/">http</a></td> + <td><a href="https://tor.linuxlounge.net/dist/">https</a></td> + <td><a href="https://tor.linuxlounge.net/">https</a></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>crazyhaze.de</td> + <td>torservers</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> - </td> + <td> - </td> +</tr> + +<tr> + + <td>US</td> + + <td>EFF</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.crazyhaze.de/dist/">http</a></td> - <td><a href="http://tor.crazyhaze.de/">http</a></td> - <td><a href="https://tor.crazyhaze.de/dist/">https</a></td> - <td><a href="https://tor.crazyhaze.de/">https</a></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> diff --git a/include/tor-mirrors.csv b/include/tor-mirrors.csv index 0eb6c6c..4d32939 100644 --- a/include/tor-mirrors.csv +++ b/include/tor-mirrors.csv @@ -19,76 +19,76 @@ mirrors[at]ip-connect[dot]vn[dot]ua, IP-Connect LLC, UA, VN, TRUE, TRUE, Yes, ht 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/, 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 10: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 13: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 Oct 22 17:02:17 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 Oct 22 17:02:17 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/, , , Tue Oct 21 20:06:45 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 Oct 22 15:12:49 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 Oct 21 20:06:45 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 12: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 Oct 22 17:02:17 2014 -haskell at gmx.es, Tor Supporter, ES, Spain, Europe, TRUE, FALSE, No, http://tor.zilog.es/, , , , http://tor.zilog.es/dist/, , , , Wed Oct 22 17:02:17 2014 -Tor Fan, Tor Supporter, US, United States, US, TRUE, FALSE, No, http://199.175.55.215/, , , , http://199.175.55.215/dist/, , , , Wed Oct 22 17:02:17 2014 -margus.random at mail.ee, CyberSIDE, EE, Estonia, EE, TRUE, FALSE, No, http://cyberside.planet.ee/tor/, , , , http://cyberside.net.ee/tor/, , , , Wed Oct 22 17:02:17 2014 -Tor Fan, torproject.is, IS, Iceland, IS, TRUE, FALSE, No, http://www.torproject.is/, , , , http://www.torproject.is/dist/, , , , Wed Oct 22 17:02:17 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 Oct 22 17:02:17 2014 -Tor Fan, me0w.cc, RO, Romania, RO, TRUE, FALSE, No, http://tor.me0w.cc/, , , , http://tor.me0w.cc/dist/, , , , Wed Oct 22 17:02:17 2014 -Tor Fan, borgmann.tv, DE, Germany, DE, TRUE, FALSE, No, http://tor.borgmann.tv/, , , , http://tor.borgmann.tv/dist/, , , , Wed Oct 22 17:02:17 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 Oct 22 17:02:17 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 15:41:01 2014 -Tor Fan, Tor Supporter, AT, Austria, AT, TRUE, FALSE, No, http://torproject.ph3x.at/, , , , http://torproject.ph3x.at/dist/, , , , Wed Oct 22 17:02:17 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 Oct 22 17:02:17 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 Oct 22 17:02:17 2014 -webmaster AT askapache DOT com, AskApache, US, California, US, TRUE, FALSE, No, http://tor.askapache.com/, , , , http://tor.askapache.com/dist/, , , , Wed Oct 22 17:02:17 2014 -Tor Fan, Tor Supporter, FR, France, FR, TRUE, FALSE, No, http://tor.mirror.chekanov.net/, , , , http://tor.mirror.chekanov.net/dist/, , , , Wed Oct 22 17:02:17 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 Oct 22 15:12:49 2014 -root AT amorphis DOT eu, Amorphis, NL, The Netherlands, Europe, TRUE, FALSE, No, http://tor.amorphis.eu/, , , , http://tor.amorphis.eu/dist/, , , , Wed Oct 22 17:02:17 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 Oct 22 17:02:17 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 Oct 22 17:02:17 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 Oct 22 17:02:17 2014 -Tor Fan, cyberarmy, AT, Austria, AT, TRUE, FALSE, No, http://tor.cyberarmy.at/, , , , , , , , Wed Oct 22 17:02:17 2014 -hostmaster AT example DOT com, TheOnionRouter, IS, Iceland, Iceland, TRUE, FALSE, No, http://www.theonionrouter.com/, , , , http://www.theonionrouter.com/dist/, , , , Wed Oct 22 17:02:17 2014 +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/, , , , Tue Oct 28 08:37:30 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, Tue Oct 28 08:37:30 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/, , , Tue Oct 28 08:37:30 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/, , , Tue Oct 28 08:37:30 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 Oct 28 08:37:30 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/, , , , Tue Oct 28 08:37:30 2014 +haskell at gmx.es, Tor Supporter, ES, Spain, Europe, TRUE, FALSE, No, http://tor.zilog.es/, , , , http://tor.zilog.es/dist/, , , , Tue Oct 28 08:37:30 2014 +Tor Fan, Tor Supporter, US, United States, US, TRUE, FALSE, No, http://199.175.55.215/, , , , http://199.175.55.215/dist/, , , , Tue Oct 28 08:28:40 2014 +margus.random at mail.ee, CyberSIDE, EE, Estonia, EE, TRUE, FALSE, No, http://cyberside.planet.ee/tor/, , , , http://cyberside.net.ee/tor/, , , , Tue Oct 28 08:37:30 2014 +Tor Fan, torproject.is, IS, Iceland, IS, TRUE, FALSE, No, http://www.torproject.is/, , , , http://www.torproject.is/dist/, , , , Tue Oct 28 08:37:30 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, , Tue Oct 28 08:37:30 2014 +Tor Fan, me0w.cc, RO, Romania, RO, TRUE, FALSE, No, http://tor.me0w.cc/, , , , http://tor.me0w.cc/dist/, , , , Mon Oct 27 16:18:23 2014 +Tor Fan, borgmann.tv, DE, Germany, DE, TRUE, FALSE, No, http://tor.borgmann.tv/, , , , http://tor.borgmann.tv/dist/, , , , Tue Oct 28 08:37:30 2014 +Tor Fan, Tor Supporter, AT, Austria, AT, TRUE, TRUE, No, http://tor.dont-know-me.at/, , , , http://tor.dont-know-me.at/dist/, , , , Tue Oct 28 08:37:30 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/, , , , Tue Oct 28 08:37:30 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, , Tue Oct 28 08:37:30 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 Oct 27 16:18:23 2014 +webmaster AT askapache DOT com, AskApache, US, California, US, TRUE, FALSE, No, http://tor.askapache.com/, , , , http://tor.askapache.com/dist/, , , , Tue Oct 28 08:37:30 2014 +Tor Fan, Tor Supporter, FR, France, FR, TRUE, FALSE, No, http://tor.mirror.chekanov.net/, , , , http://tor.mirror.chekanov.net/dist/, , , , Tue Oct 28 08:37:30 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, , , Tue Oct 28 08:37:30 2014 +root AT amorphis DOT eu, Amorphis, NL, The Netherlands, Europe, TRUE, FALSE, No, http://tor.amorphis.eu/, , , , http://tor.amorphis.eu/dist/, , , , Mon Oct 27 16:18:23 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, , , Tue Oct 28 08:37:30 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 Oct 27 16:18:23 2014 +paul at coffswifi.net, CoffsWiFi, AU, Australia and New Zealand, APNIC, TRUE, FALSE, No, http://torproject.coffswifi.net, , , , http://torproject.coffswifi.net/dist, , , , Tue Oct 28 08:37:30 2014 +Tor Fan, cyberarmy, AT, Austria, AT, TRUE, FALSE, No, http://tor.cyberarmy.at/, , , , , , , , Tue Oct 28 08:37:30 2014 +hostmaster AT example DOT com, TheOnionRouter, IS, Iceland, Iceland, TRUE, FALSE, No, http://www.theonionrouter.com/, , , , http://www.theonionrouter.com/dist/, , , , Tue Oct 28 08:37:30 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 Oct 22 17:02:17 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, , Wed Oct 22 17:02:17 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 Oct 22 17:02:17 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 Oct 22 17:02:17 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 Oct 22 17:02:17 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 Oct 22 17:02:17 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 Oct 22 17:02:17 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 Oct 22 17:02:17 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 Oct 22 17:02:17 2014 -Tor Fan, PW, DE, Germany, DE, TRUE, TRUE, NO, http://tor.pw.is/, , , , http://tor.pw.is/dist/, , , , Wed Oct 22 17:02:17 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 Oct 22 17:02:17 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 Oct 22 17:02:17 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 Oct 22 17:02:17 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 Oct 22 17:02:17 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 Oct 22 17:02:17 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 Oct 22 17:02:17 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 Oct 22 17:02:17 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/, , , Sun Oct 19 13:13:40 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 Oct 22 17:02:17 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 Oct 22 17:02:17 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 17: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 Oct 22 17:02:17 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 Oct 22 17:02:17 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 Oct 22 17:02:17 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 Oct 22 17:02:17 2014 -Sebastian, Maxanoo, NL, The Netherlands, Amsterdam, TRUE, FALSE, NO, http://tor.maxanoo.com/, , , , http://tor.maxanoo.com/dist/, , , , Wed Oct 22 17:02:17 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 Oct 22 15:12:49 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 Oct 22 17:02:17 2014 -Jacob Henner, Anatomical Networks, US, United States, US, TRUE, TRUE, TRUE, http://tor.ventricle.us/, , , , http://tor.ventricle.us/dist/, , , , Wed Oct 22 17:02:17 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 Oct 22 17:02:17 2014 -Tor Fan, Ramos Research, US, United States, US, TRUE, TRUE, No, http://tor.ramosresearch.com/, , , , http://tor.ramosresearch.com/dist/, , , , Wed Oct 22 17:02:17 2014 -Tor Fan, Tor Supporter, DE, Germany, Europe, TRUE, FALSE, No, http://tor.euve33747.vserver.de/, , , , http://tor.euve33747.vserver.de/dist, , , , Fri Oct 10 15:32:00 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 Oct 22 17:02:17 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 Oct 22 17:02:17 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/, Wed Oct 22 17:02:17 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 Oct 22 17:02:17 2014 -0x43DE8191, Tor Supporter, DE, Germany, Europe, TRUE, TRUE, No, http://torproject.hactar.bz, , , , http://torproject.hactar.bz/dist/, , , , Wed Oct 22 17:02:17 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/, , , , Tue Oct 28 08:37:30 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/, Mon Oct 27 16:18:23 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/, , , Tue Oct 28 08:37:30 2014 +Tor Fan, Lightning-bolt.net, CZ, Czech Republic, CZ, TRUE, FALSE, No, http://torproject.lightning-bolt.net/, , , , http://torproject.lightning-bolt.net/dist/, , , , Tue Oct 28 08:37:30 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/, , , Tue Oct 28 08:37:30 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/, , , Tue Oct 28 08:37:30 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/, , , Tue Oct 28 08:37:30 2014 +tor(a)les.net, tor(a)les.net, CA, Canada, CA, TRUE, FALSE, NO, http://tor.les.net/, , , , http://tor.les.net/dist, , , , Tue Oct 28 08:37:30 2014 +Tor Fan, PW, DE, Germany, DE, TRUE, TRUE, NO, http://tor.pw.is/, , , , http://tor.pw.is/dist/, , , , Tue Oct 28 08:37:30 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/, , , Tue Oct 28 08:37:30 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, Tue Oct 28 08:37:30 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/, , Tue Oct 28 08:37:30 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 Oct 27 16:18:23 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/, , , Tue Oct 28 08:37:30 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 Oct 27 16:18:23 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/, , , Tue Oct 28 08:37:30 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/, , , Tue Oct 28 08:37:30 2014 +jlgaddis AT gnu DOT org, Evil Routers, US, United States, US, TRUE, FALSE, No, http://tor1.evilrouters.net/, , , , http://tor1.evilrouters.net/dist/, , , , Tue Oct 28 08:28:40 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/, , , Tue Oct 28 08:37:30 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/, , , Tue Oct 28 08:37:30 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/, , , Tue Oct 28 08:37:30 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/, , , Tue Oct 28 08:37:30 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/, , , Tue Oct 28 08:37:30 2014 +Sebastian, Maxanoo, NL, The Netherlands, Amsterdam, TRUE, FALSE, NO, http://tor.maxanoo.com/, , , , http://tor.maxanoo.com/dist/, , , , Tue Oct 28 08:37:30 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/, , , Tue Oct 28 08:37:30 2014 +stefano.fenoglio AT gmail DOT com, Tor Supporter, IT, Italy, Europe, TRUE, FALSE, No, http://tor.stefanof.com, , , , , , http://tor.stefanof.com/dist, , Tue Oct 28 08:37:30 2014 +Jacob Henner, Anatomical Networks, US, United States, US, TRUE, TRUE, TRUE, http://tor.ventricle.us/, , , , http://tor.ventricle.us/dist/, , , , Tue Oct 28 08:37:30 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/, , , Tue Oct 28 08:37:30 2014 +Tor Fan, Ramos Research, US, United States, US, TRUE, TRUE, No, http://tor.ramosresearch.com/, , , , http://tor.ramosresearch.com/dist/, , , , Tue Oct 28 08:37:30 2014 +Tor Fan, Tor Supporter, DE, Germany, Europe, TRUE, FALSE, No, http://tor.euve33747.vserver.de/, , , , http://tor.euve33747.vserver.de/dist, , , , Tue Oct 28 08:37:30 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/, , , , Tue Oct 28 08:37:30 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, Tue Oct 28 08:37:30 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, , Tue Oct 28 08:37:30 2014 +0x43DE8191, Tor Supporter, DE, Germany, Europe, TRUE, TRUE, No, http://torproject.hactar.bz, , , , http://torproject.hactar.bz/dist/, , , , Tue Oct 28 08:37:30 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, -opi(a)zeropi.net, Tor Supporter, FR, France, FR, TRUE, TRUE, No, http://tor-mirror.zeropi.net/, , , , http://tor-mirror.zeropi.net/dist/, , , , Wed Oct 22 17:02:17 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 Oct 22 17:02:17 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 Oct 22 17:02:17 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 Oct 22 17:02:17 2014 +opi(a)zeropi.net, Tor Supporter, FR, France, FR, TRUE, TRUE, No, http://tor-mirror.zeropi.net/, , , , http://tor-mirror.zeropi.net/dist/, , , , Tue Oct 28 08:37:30 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/, , Tue Oct 28 08:37:30 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/, , Tue Oct 28 08:37:30 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/, , Tue Oct 28 08:37:30 2014

1 0

[webwml/staging] band-aid so the website doesn't look as broken
by sebastian＠torproject.org 28 Oct '14

28 Oct '14

commit 5f76c4694e87ff2ebb574fded1526f508e74396e Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Oct 28 09:33:44 2014 +0100 band-aid so the website doesn't look as broken --- en/index.wml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/en/index.wml b/en/index.wml index 8bacbf2..bc5acf5 100644 --- a/en/index.wml +++ b/en/index.wml @@ -57,7 +57,8 @@ --> <td> <div class="project"> - <a href="https://tails.boum.org/"><img + <a href="https://tails.boum.org/"><img width="75" + height="75" src="$(IMGROOT)/tails_logo.png" alt="Tails Logo"></a> <h3><a href="https://tails.boum.org/">Tails</a></h3> <p>Live CD/USB operating system preconfigured to use

1 0