commit 650c03127a877eb0de1cfad8afa5cb3d8474a956 Author: Nick Mathewson nickm@torproject.org Date: Fri Mar 11 10:33:19 2016 -0500

If we start/stop reading on a dnsserv connection, don't assert.

Fixes bug 16248. Patch from cypherpunks. Bugfix on 0.2.0.1-alpha. --- src/or/main.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)

diff --git a/src/or/main.c b/src/or/main.c index bd23141..a2b032d 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -517,6 +517,12 @@ connection_stop_reading(connection_t *conn) return; });

+ /* if dummy conn then no socket and no event, nothing to do here */ + if (conn->type == CONN_TYPE_AP && TO_EDGE_CONN(conn)->is_dns_request) { + tor_assert(!conn->read_event); + return; + } + tor_assert(conn->read_event);

if (conn->linked) { @@ -542,6 +548,12 @@ connection_start_reading(connection_t *conn) return; });

+ /* if dummy conn then no socket and no event, nothing to do here */ + if (conn->type == CONN_TYPE_AP && TO_EDGE_CONN(conn)->is_dns_request) { + tor_assert(!conn->read_event); + return; + } + tor_assert(conn->read_event);

if (conn->linked) {