0.0.2pre11, new license

svn:r564

configure.in

@@ -1,6 +1,6 @@
 
 AC_INIT
-AM_INIT_AUTOMAKE(tor, 0.0.2pre10)
+AM_INIT_AUTOMAKE(tor, 0.0.2pre11)
 AM_CONFIG_HEADER(orconfig.h)
 
 CFLAGS="-Wall -O2 -I/usr/kerberos/include"

doc/TODO

@@ -1,4 +1,5 @@
 
+let hup reread the config file, eg so we can get new exit policies without restarting
 use times(2) rather than gettimeofday to measure how long it takes to process a cell
 
 Legend:

src/or/config.c

@@ -199,6 +199,7 @@ int getconfig(int argc, char **argv, or_options_t *options) {
 /* give reasonable values for each option. Defaults to zero. */
   memset(options,0,sizeof(or_options_t));
   options->LogLevel = "info";
+  options->ExitPolicy = "reject 127.0.0.1:*,reject 18.244.0.188:25,accept *:*";
   options->loglevel = LOG_DEBUG;
   options->DataDirectory = NULL;
   options->CoinWeight = 0.1;

src/or/connection_edge.c

@@ -89,7 +89,7 @@ void connection_edge_send_command(connection_t *fromconn, circuit_t *circ, int r
   if(payload_len) {
     memcpy(cell.payload+RELAY_HEADER_SIZE,payload,payload_len);
   }
-  log_fn(LOG_INFO,"delivering %d cell %s.", relay_command,
+  log_fn(LOG_DEBUG,"delivering %d cell %s.", relay_command,
          cell_direction == CELL_DIRECTION_OUT ? "forward" : "backward");
 
   if(circuit_deliver_relay_cell(&cell, circ, cell_direction, cpath_layer) < 0) {

src/or/connection_or.c

@@ -188,7 +188,7 @@ static int connection_tls_finish_handshake(connection_t *conn) {
     if(tor_tls_peer_has_cert(conn->tls)) { /* it's another OR */
       pk = tor_tls_verify(conn->tls);
       if(!pk) {
-        log_fn(LOG_WARNING,"Other side (%s:%p) has a cert but it's invalid. Closing.",
+        log_fn(LOG_WARNING,"Other side (%s:%d) has a cert but it's invalid. Closing.",
                conn->address, conn->port);
         return -1;
       }

src/or/or.h

@@ -95,7 +95,7 @@
 #include "../common/log.h"
 #include "../common/util.h"
 
-#define RECOMMENDED_SOFTWARE_VERSIONS "0.0.2pre8,0.0.2pre9,0.0.2pre10"
+#define RECOMMENDED_SOFTWARE_VERSIONS "0.0.2pre8,0.0.2pre9,0.0.2pre10,0.0.2pre11"
 
 #define MAXCONNECTIONS 1000 /* upper bound on max connections.
                               can be lowered by config file */