[tor-commits] [stem/master] Fix tbbscraper link

[atagar at torproject.org]

commit dd5713367420e8af937fba47df484c4f36ed828c
Author: Damian Johnson <atagar at torproject.org>
Date:   Thu Jun 30 08:51:52 2016 -0700

    Fix tbbscraper link
    
    Directory structure of the project changed breaking our link. Caught thanks to
    edoardo.
---
 docs/tutorials/double_double_toil_and_trouble.rst | 2 +-
 test/integ/control/controller.py                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/tutorials/double_double_toil_and_trouble.rst b/docs/tutorials/double_double_toil_and_trouble.rst
index 54df821..61f8c79 100644
--- a/docs/tutorials/double_double_toil_and_trouble.rst
+++ b/docs/tutorials/double_double_toil_and_trouble.rst
@@ -64,7 +64,7 @@ Applications
 `Onion Box <https://github.com/ralphwetzel/theonionbox>`_                                                   Web dashboard for relay operation.
 `check_tor <http://anonscm.debian.org/gitweb/?p=users/lunar/check_tor.git;a=blob;f=check_tor.py;hb=HEAD>`_  Nagios check to verify that a relay is participating in the Tor network.
 `munin-tor <https://github.com/mweinelt/munin-tor>`_                                                        Plugin to provide Munin graphs.
-`tbbscraper <https://github.com/zackw/tbbscraper/blob/master/controller/controller.py>`_                    Automated website scraper over Tor.
+`tbbscraper <https://github.com/zackw/tbbscraper/blob/master/collector/lib/controller/controller.py>`_      Automated website scraper over Tor.
 `torirc <https://github.com/alfred-gw/torirc>`_                                                             IRC-like chat client using Tor hidden services.
 `exit-funding <https://github.com/torservers/exit-funding>`_                                                Script to estimate how much exit relays have been used.
 `torsearch <https://github.com/wfn/torsearch>`_                                                             Search engine prototype for descriptor data.
diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py
index 7aa8a83..440c9d5 100644
--- a/test/integ/control/controller.py
+++ b/test/integ/control/controller.py
@@ -704,7 +704,7 @@ class TestController(unittest.TestCase):
 
     with runner.get_tor_controller() as controller:
       try:
-        response = controller.create_ephemeral_hidden_service(4567, basic_auth = {})
+        controller.create_ephemeral_hidden_service(4567, basic_auth = {})
         self.fail('ADD_ONION should fail when using basic auth without any clients')
       except stem.ProtocolError as exc:
         self.assertEqual("ADD_ONION response didn't have an OK status: No auth clients specified", str(exc))