diff -urNb old.nmap.rev/nmap.cc new.nmap.rev/nmap.cc
--- old.nmap.rev/nmap.cc	Tue May 16 13:49:17 2006
+++ new.nmap.rev/nmap.cc	Tue May 16 13:49:17 2006
@@ -245,6 +245,7 @@
        "  --max-retries <tries>: Caps number of port scan probe retransmissions.\n"
        "  --host-timeout <time>: Give up on target after this long\n"
        "  --scan-delay/--max-scan-delay <time>: Adjust delay between probes\n"
+       "  --timing-report: Reports exactly what timing parameters in use\n"
        "FIREWALL/IDS EVASION AND SPOOFING:\n"
        "  -f; --mtu <val>: fragment packets (optionally w/given MTU)\n"
        "  -D <decoy1,decoy2[,ME],...>: Cloak a scan with decoys\n"
@@ -478,6 +479,7 @@
   int pre_max_parallelism=-1, pre_scan_delay=-1, pre_max_scan_delay=-1;
   int pre_init_rtt_timeout=-1, pre_min_rtt_timeout=-1, pre_max_rtt_timeout=-1;
   int pre_max_retries=-1, pre_host_timeout=-1;
+  int pre_timing_report=-1;
 
   struct option long_options[] =
     {
@@ -573,6 +575,8 @@
       {"log-errors", no_argument, 0, 0},
       {"dns_servers", required_argument, 0, 0},
       {"dns-servers", required_argument, 0, 0},
+      {"timing_report", no_argument, 0, 0},
+      {"timing-report", no_argument, 0, 0},
       {0, 0, 0, 0}
     };
 
@@ -720,6 +724,8 @@
         o.dns_servers = strdup(optarg);
       } else if (optcmp(long_options[option_index].name, "log-errors") == 0) {
         o.log_errors = 1;
+      } else if (optcmp(long_options[option_index].name, "timing-report") == 0) {
+        pre_timing_report=1;
       } else if (strcmp(long_options[option_index].name, "webxml") == 0) {
 	o.setXSLStyleSheet("http://www.insecure.org/nmap/data/nmap.xsl");
       } else if (strcmp(long_options[option_index].name, "oN") == 0) {
@@ -1321,6 +1327,16 @@
 
   if (o.debugging > 1) log_write(LOG_STDOUT, "The max # of sockets we are using is: %d\n", o.max_parallelism);
 
+  // At this point we should fully know our timing parameters
+  if (pre_timing_report != -1) {
+    printf("---------- Timing report ----------\n");
+    printf("  hostgroups: min %d, max %d\n", o.minHostGroupSz(), o.maxHostGroupSz());
+    printf("  rtt-timeouts: init %d, min %d, max %d\n", o.initialRttTimeout(), o.minRttTimeout(), o.maxRttTimeout());
+    printf("  scan-delay: TCP %d, UDP %d\n", o.maxTCPScanDelay(), o.maxUDPScanDelay());
+    printf("  parallelism: min %d, max %d\n", o.min_parallelism, o.max_parallelism);
+    printf("  max-retries: %d, host-timeout %ld\n", o.getMaxRetransmissions(), o.host_timeout);
+    printf("-----------------------------------\n");
+  }
 
   if  (randomize) {
     if (ports->tcp_count) {