Skip to content

Commit

Permalink
Merge pull request #75 from david415/david_endpoint_parser_squashed_5
Browse files Browse the repository at this point in the history
Minor corrections to comments
  • Loading branch information
meejah committed May 31, 2014
2 parents 237464f + 7a1cdc9 commit 474cd76
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions txtorcon/endpoints.py
Expand Up @@ -126,7 +126,7 @@ class TCPHiddenServiceEndpoint(object):
however.
2. global_tor(...) refers to a single possible Tor instance
txtorcon-wide. So the first call to this launches a new Tor, and
per python process. So the first call to this launches a new Tor, and
subsequent calls re-use the existing Tor (that is, add more hidden
services to it).
Expand Down Expand Up @@ -284,8 +284,7 @@ def __init__(self, reactor, config, public_port,
If not None, point to a HiddenServiceDir directory
(i.e. with "hostname" and "private_key" files in it). If
not provided, one is created with temp.mkstemp() AND
DELETED when the reactor shuts down. (XXX can we do it
sooner? stopListening())
DELETED when the reactor shuts down.
:param endpoint_generator:
A callable that generates a new instance of something that
Expand Down Expand Up @@ -342,7 +341,7 @@ def listen(self, protocolfactory):
Implement :api:`twisted.internet.interfaces.IStreamServerEndpoint <IStreamServerEndpoint>`.
Returns a Deferred that delivers an
:api:`twisted.internet.interfaces.IPort` implementation.
:api:`twisted.internet.interfaces.IListeningPort` implementation.
This port can also be adapted to two other interfaces:
Expand Down

0 comments on commit 474cd76

Please sign in to comment.