diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-03-08 15:52:43 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-03-08 15:52:43 -0500 |
| commit | 0d78a16c3642f7538266e007da79c39860aac332 (patch) | |
| tree | 5e342568b1f08b14318ddd3b3996aa1125d20787 /src/or/connection_or.c | |
| parent | 9c72324ae85c3f2cc23fee7d383128fa239b36d0 (diff) | |
| parent | 5a4f7fa1e48923730376c0a42121e4c3022eef3b (diff) | |
| download | tor-0d78a16c3642f7538266e007da79c39860aac332.tar.gz tor-0d78a16c3642f7538266e007da79c39860aac332.zip | |
Merge remote branch 'sebastian/bug1035' into maint-0.2.2
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 b93699ccc1..2d2444462d 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1098,9 +1098,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); } |