|
@@ -53,7 +53,7 @@ diff -urNad git-trunk-conf~/src/or/config.c git-trunk-conf/src/or/config.c
|
|
if (argv) { /* first time we're called. save commandline args */
|
|
if (argv) { /* first time we're called. save commandline args */
|
|
backup_argv = argv;
|
|
backup_argv = argv;
|
|
backup_argc = argc;
|
|
backup_argc = argc;
|
|
-@@ -5051,3 +5057,64 @@
|
|
+@@ -5051,3 +5057,60 @@
|
|
puts(routerparse_c_id);
|
|
puts(routerparse_c_id);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -112,9 +112,5 @@ diff -urNad git-trunk-conf~/src/or/config.c git-trunk-conf/src/or/config.c
|
|
+ tor_assert(var);
|
|
+ tor_assert(var);
|
|
+ var->initvalue = tor_strdup("debian-tor");
|
|
+ var->initvalue = tor_strdup("debian-tor");
|
|
+
|
|
+
|
|
-+ var = config_find_option(&options_format, "Group");
|
|
|
|
-+ tor_assert(var);
|
|
|
|
-+ var->initvalue = tor_strdup("debian-tor");
|
|
|
|
-+
|
|
|
|
+ return 0;
|
|
+ return 0;
|
|
+}
|
|
+}
|