Commit 75922ff4 authored by Nick Mathewson's avatar Nick Mathewson 🏃
Browse files

r16663@catbus: nickm | 2007-11-13 21:51:28 -0500

 Back out parts of r12376: replace file locations in scripts.


svn:r12490
parent 6739ef40
Changes in version 0.2.0.12-alpha - 2007-11-?? Changes in version 0.2.0.12-alpha - 2007-11-??
o Compile fixes: o Compile fixes:
- Make it build on OpenBSD again. Patch from tup. - 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 Changes in version 0.2.0.11-alpha - 2007-11-12
o Security fixes: o Security fixes:
......
...@@ -620,6 +620,11 @@ AC_SUBST(CONFDIR) ...@@ -620,6 +620,11 @@ AC_SUBST(CONFDIR)
AH_TEMPLATE([CONFDIR],[tor's configuration directory]) AH_TEMPLATE([CONFDIR],[tor's configuration directory])
AC_DEFINE_UNQUOTED(CONFDIR,"$CONFDIR") 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 # Set CFLAGS _after_ all the above checks, since our warnings are stricter
# than autoconf's macros like. # than autoconf's macros like.
if test $ac_cv_c_compiler_gnu = yes; then if test $ac_cv_c_compiler_gnu = yes; then
......
...@@ -456,6 +456,9 @@ connection_or_get_by_identity_digest(const char *digest) ...@@ -456,6 +456,9 @@ connection_or_get_by_identity_digest(const char *digest)
continue; /* avoid non-open conns if we can */ continue; /* avoid non-open conns if we can */
newer = best->_base.timestamp_created < conn->_base.timestamp_created; 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) if (!best->_base.or_is_obsolete && conn->_base.or_is_obsolete)
continue; /* We never prefer obsolete over non-obsolete connections. */ continue; /* We never prefer obsolete over non-obsolete connections. */
...@@ -763,7 +766,6 @@ connection_tls_finish_handshake(or_connection_t *conn) ...@@ -763,7 +766,6 @@ connection_tls_finish_handshake(or_connection_t *conn)
directory_set_dirty(); directory_set_dirty();
if (tor_tls_used_v1_handshake(conn->tls)) { if (tor_tls_used_v1_handshake(conn->tls)) {
conn->link_proto = 1; conn->link_proto = 1;
if (connection_or_check_valid_tls_handshake(conn, started_here, if (connection_or_check_valid_tls_handshake(conn, started_here,
digest_rcvd) < 0) digest_rcvd) < 0)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment