diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-11-14 02:55:12 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-11-14 02:55:12 +0000 |
| commit | 75922ff41f5518e44ac8752a37922de855488915 (patch) | |
| tree | 8a9eb7a3202a2368557cc4444edddc9fd4bfa535 | |
| parent | 6739ef40277b012f44e8209bb3c9e352cccc5cb1 (diff) | |
| download | tor-75922ff41f5518e44ac8752a37922de855488915.tar.gz tor-75922ff41f5518e44ac8752a37922de855488915.zip | |
r16663@catbus: nickm | 2007-11-13 21:51:28 -0500
Back out parts of r12376: replace file locations in scripts.
svn:r12490
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | configure.in | 5 | ||||
| -rw-r--r-- | src/or/connection_or.c | 4 |
3 files changed, 9 insertions, 2 deletions
@@ -1,7 +1,7 @@ Changes in version 0.2.0.12-alpha - 2007-11-?? o Compile fixes: - Make it build on OpenBSD again. Patch from tup. - + - Substitute BINDIR and LOCALSTATEDIR in scripts. Fixes packaging. Changes in version 0.2.0.11-alpha - 2007-11-12 o Security fixes: diff --git a/configure.in b/configure.in index f8ad33516e..9d20e47a3b 100644 --- a/configure.in +++ b/configure.in @@ -620,6 +620,11 @@ AC_SUBST(CONFDIR) AH_TEMPLATE([CONFDIR],[tor's configuration directory]) AC_DEFINE_UNQUOTED(CONFDIR,"$CONFDIR") +BINDIR=`eval echo $bindir` +AC_SUBST(BINDIR) +LOCALSTATEDIR=`eval echo $localstatedir` +AC_SUBST(LOCALSTATEDIR) + # Set CFLAGS _after_ all the above checks, since our warnings are stricter # than autoconf's macros like. if test $ac_cv_c_compiler_gnu = yes; then diff --git a/src/or/connection_or.c b/src/or/connection_or.c index fb29fa5870..4071c9cf8d 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -456,6 +456,9 @@ connection_or_get_by_identity_digest(const char *digest) continue; /* avoid non-open conns if we can */ newer = best->_base.timestamp_created < conn->_base.timestamp_created; + if (best->is_canonical && !conn->is_canonical) + continue; /* A canonical connection is best. */ + if (!best->_base.or_is_obsolete && conn->_base.or_is_obsolete) continue; /* We never prefer obsolete over non-obsolete connections. */ @@ -763,7 +766,6 @@ connection_tls_finish_handshake(or_connection_t *conn) directory_set_dirty(); if (tor_tls_used_v1_handshake(conn->tls)) { - conn->link_proto = 1; if (connection_or_check_valid_tls_handshake(conn, started_here, digest_rcvd) < 0) |