diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-03-08 16:10:40 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-03-08 16:10:40 -0500 |
| commit | f9bb3ced51422bc8f6c3702a169a799614bbce02 (patch) | |
| tree | 6a6d23808b219366bfe433aa4d00bbb114e69ac0 /src/or/connection_or.c | |
| parent | d5907e7d9d79297cc7359aeae810972a1b834e23 (diff) | |
| parent | 0d78a16c3642f7538266e007da79c39860aac332 (diff) | |
| download | tor-f9bb3ced51422bc8f6c3702a169a799614bbce02.tar.gz tor-f9bb3ced51422bc8f6c3702a169a799614bbce02.zip | |
Merge remote branch 'origin/maint-0.2.2'
Resolved trivial one-line conflicts.
Conflicts:
src/or/dirserv.c
src/or/rephist.c
Diffstat (limited to 'src/or/connection_or.c')
| -rw-r--r-- | src/or/connection_or.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 5e28f94314..01cc160158 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1237,9 +1237,6 @@ connection_or_check_valid_tls_handshake(or_connection_t *conn, as_advertised = 0; } if (authdir_mode_tests_reachability(options)) { - /* We initiated this connection to address:port. Drop all routers - * with the same address:port and a different key. - */ dirserv_orconn_tls_done(conn->_base.address, conn->_base.port, digest_rcvd_out, as_advertised); } |