commit 30290b73ff45134d4e76eda510337577405b3ba6 Author: Damian Johnson <atagar@torproject.org> Date: Thu Mar 27 09:53:46 2014 -0700 Adding munin-tor to our examples Neat plugin from Martin for Munin... https://lists.torproject.org/pipermail/tor-relays/2014-March/004168.html --- docs/tutorials/double_double_toil_and_trouble.rst | 1 + stem/response/events.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/tutorials/double_double_toil_and_trouble.rst b/docs/tutorials/double_double_toil_and_trouble.rst index 64b2a3c..8104110 100644 --- a/docs/tutorials/double_double_toil_and_trouble.rst +++ b/docs/tutorials/double_double_toil_and_trouble.rst @@ -45,6 +45,7 @@ Applications `TorPS <https://www.torproject.org/getinvolved/volunteer.html.en#project-torps>`_ Tor path simulator. `Metrics Tasks <https://gitweb.torproject.org/metrics-tasks.git/tree>`_ One-off tasks related to Tor metrics. These mostly involve using descriptor information to answer a particular question. Tasks that involve Stem are: `1854 <https://gitweb.torproject.org/metrics-tasks.git/blob/HEAD:/task-1854/pylinf.py>`_, `6232 <https://gitweb.torproject.org/metrics-tasks.git/blob/HEAD:/task-6232/pyentropy.py>`_, and `7241 <https://gitweb.torproject.org/metrics-tasks.git/blob/HEAD:/task-7241/first_pass.py>`_. `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. `torirc <https://github.com/alfred-gw/torirc>`_ IRC-like chat client using Tor hidden services. `ExitMap <https://github.com/NullHypothesis/exitmap>`_ Scanner for malicious or misconfigured Tor exits. diff --git a/stem/response/events.py b/stem/response/events.py index 250697d..9f1b628 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -601,7 +601,7 @@ class GuardEvent(Event): self.endpoint_fingerprint, self.endpoint_nickname = \ stem.control._parse_circ_entry(self.endpoint) except stem.ProtocolError: - raise stem.ProtocolError("ORCONN's endpoint doesn't match a ServerSpec: %s" % self) + raise stem.ProtocolError("GUARD's endpoint doesn't match a ServerSpec: %s" % self) self._log_if_unrecognized('guard_type', stem.GuardType) self._log_if_unrecognized('status', stem.GuardStatus)