add circuit-level sendme relay cells

remove sendme cells
replace malloc with tor_malloc
patch (but not track down) bug in onion pending list
streamline connection_ap handshake


svn:r293

1 files changed, 2 insertions, 2 deletions

diff --git a/src/or/config.c b/src/or/config.c
index 745b76d8c..6107a7eeb 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -43,7 +43,7 @@ struct config_line *config_get_commandlines(int argc, char **argv) {
       continue;
     }
 
-    new = malloc(sizeof(struct config_line));
+    new = tor_malloc(sizeof(struct config_line));
     s = argv[i];
     while(*s == '-')
       s++;
@@ -107,7 +107,7 @@ struct config_line *config_get_lines(FILE *f) {
     *end = 0; /* null it out */
 
     /* prepare to parse the string into key / value */
-    new = malloc(sizeof(struct config_line));
+    new = tor_malloc(sizeof(struct config_line));
     new->key = strdup(start);
     new->value = strdup(s);