Update onion address used for documentation

docs/conf.py

@@ -165,7 +165,7 @@
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
-html_title = 'timaq4ygg2iegci7.onion: txtorcon documentation'
+html_title = 'fjblvrw2jrxnhtg67qpbzi45r7ofojaoo3orzykesly2j3c2m3htapid.onion: txtorcon documentation'
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
 html_short_title = 'txtorcon docs'

docs/guide.rst

@@ -361,7 +361,7 @@ You can also use Twisted's `clientFromString`_ API as txtorcon
 registers a ``tor:`` plugin. This also implies that any Twisted-using
 program that supports configuring endpoint strings gets Tor support
 "for free". For example, passing a string like
-``tor:timaq4ygg2iegci7.onion:80`` to `clientFromString`_ will return
+``tor:fjblvrw2jrxnhtg67qpbzi45r7ofojaoo3orzykesly2j3c2m3htapid.onion:80`` to `clientFromString`_ will return
 an endpoint that will connect to txtorcon's onion-service
 website. Note that these endpoints will use the "global to txtorcon"
 Tor instance (available from :meth:`.get_global_tor`). Thus,
@@ -428,7 +428,7 @@ From an API perspective, here are the parts we care about:
   part);
    - these keys can be on disk (in the "hidden service directory");
    - or, they can be "ephemeral" (only in memory);
-- the "host name" is a hash of the public-key (e.g. ``timaq4ygg2iegci7.onion``);
+- the "host name" is a hash of the public-key (e.g. ``fjblvrw2jrxnhtg67qpbzi45r7ofojaoo3orzykesly2j3c2m3htapid.onion``);
 - a "Descriptor" (which tells clients how to connect) must be
   published (to a "Hidden Service Directory", or HSDir);
 - a service has a list of port-mappings (public -> local):
@@ -534,7 +534,7 @@ least explicit):
 Factors to consider when deciding whether to use "authenticated"
 service or not:
 
- - if you want anyone with e.g. the URL http://timaq4ygg2iegci7.onion
+ - if you want anyone with e.g. the URL http://fjblvrw2jrxnhtg67qpbzi45r7ofojaoo3orzykesly2j3c2m3htapid.onion
    to be able to put it in `Tor Browser Bundle
    <https://www.torproject.org/download/download.html.en>`_ and see a
    Web site, you **do not want** authentication;

docs/installing.rst

@@ -89,11 +89,11 @@ Source Code
 -----------
 
 Most people will use the code from https://github.com/meejah/txtorcon
-The canonical URI is http://timaq4ygg2iegci7.onion
+The canonical URI is http://fjblvrw2jrxnhtg67qpbzi45r7ofojaoo3orzykesly2j3c2m3htapid.onion
 I sign tags with my public key (:download:`meejah.asc <../meejah.asc>`)
 
 - ``git clone https://github.com/meejah/txtorcon.git``
-- ``torsocks git clone git://timaq4ygg2iegci7.onion/meejah/txtorcon.git``
+- ``torsocks git clone git://fjblvrw2jrxnhtg67qpbzi45r7ofojaoo3orzykesly2j3c2m3htapid.onion/meejah/txtorcon.git``
 
 Rendered documentation for the latest release is at `txtorcon.readthedocs.org <https://txtorcon.readthedocs.org/en/latest/>`_.
 

docs/release-checklist.rst

@@ -73,8 +73,8 @@ Release Checklist
 
            Releases are also available from the hidden service:
 
-              http://timaq4ygg2iegci7.onion/txtorcon-0.12.0.tar.gz
-              http://timaq4ygg2iegci7.onion/txtorcon-0.12.0.tar.gz.asc
+              http://fjblvrw2jrxnhtg67qpbzi45r7ofojaoo3orzykesly2j3c2m3htapid.onion/txtorcon-0.12.0.tar.gz
+              http://fjblvrw2jrxnhtg67qpbzi45r7ofojaoo3orzykesly2j3c2m3htapid.onion/txtorcon-0.12.0.tar.gz.asc
 
            Or via a "version 3" service:
 

examples/web_client.py

@@ -32,7 +32,7 @@ def main(reactor):
     agent = tor.web_agent()
     uri = b'http://surely-this-has-not-been-registered-and-is-invalid.com'
     uri = b'https://www.torproject.org'
-    uri = b'http://timaq4ygg2iegci7.onion/'  # txtorcon documentation
+    uri = b'http://fjblvrw2jrxnhtg67qpbzi45r7ofojaoo3orzykesly2j3c2m3htapid.onion/'  # txtorcon documentation
     print("Downloading {}".format(uri))
     resp = yield agent.request(b'GET', uri)
 

test/test_endpoints.py

@@ -1593,9 +1593,9 @@ def test_no_host(self):
         )
 
     def test_parser_basic(self):
-        ep = clientFromString(None, 'tor:host=timaq4ygg2iegci7.onion:port=80:socksPort=9050')
+        ep = clientFromString(None, 'tor:host=fjblvrw2jrxnhtg67qpbzi45r7ofojaoo3orzykesly2j3c2m3htapid.onion:port=80:socksPort=9050')
 
-        self.assertEqual(ep.host, 'timaq4ygg2iegci7.onion')
+        self.assertEqual(ep.host, 'fjblvrw2jrxnhtg67qpbzi45r7ofojaoo3orzykesly2j3c2m3htapid.onion')
         self.assertEqual(ep.port, 80)
         # XXX what's "the Twisted way" to get the port out here?
         self.assertEqual(ep._socks_endpoint._port, 9050)

test/test_stream.py

@@ -365,7 +365,7 @@ def test_states_and_uris(self):
         for address in [
                 '1.2.3.4:80',
                 '1.2.3.4.315D5684D5343580D409F16119F78D776A58AEFB.exit:80',
-                'timaq4ygg2iegci7.onion:80']:
+                'fjblvrw2jrxnhtg67qpbzi45r7ofojaoo3orzykesly2j3c2m3htapid.onion:80']:
 
             line = "316 %s 1 %s REASON=FOO"
             for state in ['NEW', 'SUCCEEDED', 'REMAP',

test3/test_controller.py

@@ -31,7 +31,7 @@ async def async_test_authentication(self):
         add = patch.object(self.tor, "add_onion_authentication", return_value=succeed(None))
         remove = patch.object(self.tor, "remove_onion_authentication", return_value=succeed(None))
         with add as adder, remove as remover:
-            async with self.tor.onion_authentication("timaq4ygg2iegci7.onion", "seekrit token"):
+            async with self.tor.onion_authentication("fjblvrw2jrxnhtg67qpbzi45r7ofojaoo3orzykesly2j3c2m3htapid.onion", "seekrit token"):
                 self.assertTrue(adder.called)
                 self.assertFalse(remover.called)
             self.assertTrue(remover.called)

txtorcon/controller.py

@@ -692,9 +692,9 @@ def onion_authentication(self, onion_host, token):
         add and remove onion authentication. For example, inside an
         `async def` method that's had `ensureDeferred` called on it::
 
-            async with tor.onion_authentication("timaq4ygg2iegci7.onion", "seekrit token"):
+            async with tor.onion_authentication("fjblvrw2jrxnhtg67qpbzi45r7ofojaoo3orzykesly2j3c2m3htapid.onion", "seekrit token"):
                 agent = tor.web_agent()
-                resp = await agent.request(b'GET', "http://timaq4ygg2iegci7.onion/")
+                resp = await agent.request(b'GET', "http://fjblvrw2jrxnhtg67qpbzi45r7ofojaoo3orzykesly2j3c2m3htapid.onion/")
                 body = await readBody(resp)
             # after the "async with" the token will be removed from Tor's configuration
 

txtorcon/endpoints.py

@@ -203,7 +203,7 @@ class TCPHiddenServiceEndpoint(object):
     :class:`txtorcon.IAuthenticatedOnionClients` instance (and from
     which you can recover private keys, the hostname, etc)
 
-    :ivar onion_uri: the public key, like ``timaq4ygg2iegci7.onion``
+    :ivar onion_uri: the public key, like ``fjblvrw2jrxnhtg67qpbzi45r7ofojaoo3orzykesly2j3c2m3htapid.onion``
         which came from the hidden_service_dir's ``hostname`` file
 
     :ivar onion_private_key: the contents of ``hidden_service_dir/private_key``
@@ -1193,11 +1193,11 @@ class TorClientEndpointStringParser(object):
     :api:`twisted.internet.endpoints.clientFromString
     <clientFromString>` with a string argument like:
 
-    ``tor:host=timaq4ygg2iegci7.onion:port=80:socksPort=9050``
+    ``tor:host=fjblvrw2jrxnhtg67qpbzi45r7ofojaoo3orzykesly2j3c2m3htapid.onion:port=80:socksPort=9050``
 
     ...or simply:
 
-    ``tor:host=timaq4ygg2iegci7.onion:port=80``
+    ``tor:host=fjblvrw2jrxnhtg67qpbzi45r7ofojaoo3orzykesly2j3c2m3htapid.onion:port=80``
 
     You may also include a username + password. By default, Tor will
     not put two streams that provided different authentication on the