| 
														
															@@ -134,18 +134,30 @@ parse_commandline(int argc, char **argv) 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         fprintf(stderr, "No argument to -i\n"); 
														 | 
														
														 | 
														
															         fprintf(stderr, "No argument to -i\n"); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         return 1; 
														 | 
														
														 | 
														
															         return 1; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															       } 
														 | 
														
														 | 
														
															       } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+      if (identity_key_file) { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        fprintf(stderr, "Duplicate values for -i\n"); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        return -1; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+      } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															       identity_key_file = tor_strdup(argv[++i]); 
														 | 
														
														 | 
														
															       identity_key_file = tor_strdup(argv[++i]); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     } else if (!strcmp(argv[i], "-s")) { 
														 | 
														
														 | 
														
															     } else if (!strcmp(argv[i], "-s")) { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															       if (i+1>=argc) { 
														 | 
														
														 | 
														
															       if (i+1>=argc) { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         fprintf(stderr, "No argument to -s\n"); 
														 | 
														
														 | 
														
															         fprintf(stderr, "No argument to -s\n"); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         return 1; 
														 | 
														
														 | 
														
															         return 1; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															       } 
														 | 
														
														 | 
														
															       } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+      if (signing_key_file) { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        fprintf(stderr, "Duplicate values for -s\n"); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        return -1; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+      } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															       signing_key_file = tor_strdup(argv[++i]); 
														 | 
														
														 | 
														
															       signing_key_file = tor_strdup(argv[++i]); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     } else if (!strcmp(argv[i], "-c")) { 
														 | 
														
														 | 
														
															     } else if (!strcmp(argv[i], "-c")) { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															       if (i+1>=argc) { 
														 | 
														
														 | 
														
															       if (i+1>=argc) { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         fprintf(stderr, "No argument to -c\n"); 
														 | 
														
														 | 
														
															         fprintf(stderr, "No argument to -c\n"); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         return 1; 
														 | 
														
														 | 
														
															         return 1; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															       } 
														 | 
														
														 | 
														
															       } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+      if (certificate_file) { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        fprintf(stderr, "Duplicate values for -c\n"); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        return -1; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+      } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															       certificate_file = tor_strdup(argv[++i]); 
														 | 
														
														 | 
														
															       certificate_file = tor_strdup(argv[++i]); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     } else if (!strcmp(argv[i], "-m")) { 
														 | 
														
														 | 
														
															     } else if (!strcmp(argv[i], "-m")) { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															       if (i+1>=argc) { 
														 | 
														
														 | 
														
															       if (i+1>=argc) { 
														 |