diff options
| author | Karsten Loesing <karsten.loesing@gmx.net> | 2008-12-22 01:16:14 +0000 |
|---|---|---|
| committer | Karsten Loesing <karsten.loesing@gmx.net> | 2008-12-22 01:16:14 +0000 |
| commit | 61e7489691cddf288b7fafc048dcab98e1f294b3 (patch) | |
| tree | 96269acde4bff416ef5e4f64eefc5a195707a89b | |
| parent | 54e565592427a9dfb79adcbae0364b7a579aec13 (diff) | |
| download | tor-61e7489691cddf288b7fafc048dcab98e1f294b3.tar.gz tor-61e7489691cddf288b7fafc048dcab98e1f294b3.zip | |
Make check-spaces happy.
svn:r17719
| -rw-r--r-- | src/or/circuituse.c | 6 | ||||
| -rw-r--r-- | src/or/test.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c index ea82241407..083f21567e 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1020,10 +1020,12 @@ circuit_get_open_circ_or_launch(edge_connection_t *conn, uint32_t addr = 0; if (tor_inet_aton(conn->socks_request->address, &in)) addr = ntohl(in.s_addr); - if (router_exit_policy_all_routers_reject(addr, conn->socks_request->port, + if (router_exit_policy_all_routers_reject(addr, + conn->socks_request->port, need_uptime)) { log_notice(LD_APP, - "No Tor server exists that allows exit to %s:%d. Rejecting.", + "No Tor server exists that allows exit to %s:%d. " + "Rejecting.", safe_str(conn->socks_request->address), conn->socks_request->port); return -1; diff --git a/src/or/test.c b/src/or/test.c index 6a7d2729fb..6e483e0094 100644 --- a/src/or/test.c +++ b/src/or/test.c @@ -2558,7 +2558,7 @@ test_v3_networkstatus(void) sign_skey_2 = crypto_new_pk_env(); sign_skey_3 = crypto_new_pk_env(); sign_skey_leg1 = pk_generate(4); - + test_assert(!crypto_pk_read_private_key_from_string(sign_skey_1, AUTHORITY_SIGNKEY_1)); test_assert(!crypto_pk_read_private_key_from_string(sign_skey_2, |