[or-cvs] 0.0.2pre11, new license

[arma@seul.org (Roger Dingledine)]

Update of /home/or/cvsroot/src/or
In directory moria.mit.edu:/home2/arma/work/onion/cvs/src/or

Modified Files:
	config.c connection_edge.c connection_or.c or.h 
Log Message:
0.0.2pre11, new license


Index: config.c
===================================================================
RCS file: /home/or/cvsroot/src/or/config.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- config.c	8 Oct 2003 02:04:07 -0000	1.54
+++ config.c	8 Oct 2003 04:10:54 -0000	1.55
@@ -199,6 +199,7 @@
 /* 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;

Index: connection_edge.c
===================================================================
RCS file: /home/or/cvsroot/src/or/connection_edge.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- connection_edge.c	8 Oct 2003 02:04:07 -0000	1.35
+++ connection_edge.c	8 Oct 2003 04:10:56 -0000	1.36
@@ -89,7 +89,7 @@
   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) {

Index: connection_or.c
===================================================================
RCS file: /home/or/cvsroot/src/or/connection_or.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- connection_or.c	8 Oct 2003 02:04:07 -0000	1.65
+++ connection_or.c	8 Oct 2003 04:10:57 -0000	1.66
@@ -188,7 +188,7 @@
     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;
       }

Index: or.h
===================================================================
RCS file: /home/or/cvsroot/src/or/or.h,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -d -r1.160 -r1.161
--- or.h	8 Oct 2003 02:04:08 -0000	1.160
+++ or.h	8 Oct 2003 04:10:59 -0000	1.161
@@ -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 */