From ea00437f7475fee28cb15a3a2d1136a4114a97af Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Sun, 8 Oct 2006 00:33:43 +0000 Subject: [PATCH] r8933@totoro: nickm | 2006-10-07 20:33:16 -0400 whitespace fixes; add changelog for last commit. svn:r8644 --- ChangeLog | 7 +++++++ contrib/checkSpace.pl | 2 +- src/or/circuitbuild.c | 3 ++- src/or/connection_or.c | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index bd58b85c63..3640470254 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Changes in version 0.1.2.3-alpha - 2006-10-?? + + o Minor bugfixes: + - Change NT service functions to be loaded on demand. This lets us + build with mingw without breaking Tor for Windows 98 users. + + Changes in version 0.1.2.2-alpha - 2006-10-07 o Major features: - Make our async eventdns library on-by-default for Tor servers, diff --git a/contrib/checkSpace.pl b/contrib/checkSpace.pl index aff96861a9..7c2ee39d1d 100755 --- a/contrib/checkSpace.pl +++ b/contrib/checkSpace.pl @@ -83,7 +83,7 @@ for $fn (@ARGV) { if (/(\w+)\s\(/) { if ($1 ne "if" and $1 ne "while" and $1 ne "for" and $1 ne "switch" and $1 ne "return" and $1 ne "int" and - $1 ne "elsif" and + $1 ne "elsif" and $1 ne "WINAPI" and $1 ne "void" and $1 ne "__attribute__") { print " fn ():$fn:$.\n"; } diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 7c4501356a..a4cf8a284e 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -95,7 +95,8 @@ get_unique_circ_id_by_conn(or_connection_t *conn) * the currently built elements of circuit_t. If verbose is true, also * list information about link status in a more verbose format using spaces. * If verbose_names is false, give nicknames for Named routers and hex - * digests for others; if verbose_names is true, + * digests for others; if verbose_names is true, use $DIGEST=Name style + * names. */ static char * circuit_list_path_impl(origin_circuit_t *circ, int verbose, int verbose_names) diff --git a/src/or/connection_or.c b/src/or/connection_or.c index e8681d9a50..0409791562 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -623,7 +623,7 @@ connection_or_check_valid_handshake(or_connection_t *conn, char *digest_rcvd) "Identity key not as expected for router at %s:%d: wanted %s " "but got %s", conn->_base.address, conn->_base.port, expected, seen); - entry_guard_register_connect_status(conn->identity_digest, 0, time(NULL)); + entry_guard_register_connect_status(conn->identity_digest,0,time(NULL)); router_set_status(conn->identity_digest, 0); control_event_or_conn_status(conn, OR_CONN_EVENT_FAILED); as_advertised = 0;