[or-cvs] r9829: Clarify section of dir-spec.txt that explains how "v" resolu (in tor/trunk: . doc/spec src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-03-15 12:27:57 -0400 (Thu, 15 Mar 2007)
New Revision: 9829

Modified:
   tor/trunk/
   tor/trunk/doc/spec/dir-spec.txt
   tor/trunk/src/or/test.c
Log:
 r12182 at catbus:  nickm | 2007-03-15 10:58:12 -0400
 Clarify section of dir-spec.txt that explains how "v" resolution happens.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r12182] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/doc/spec/dir-spec.txt
===================================================================
--- tor/trunk/doc/spec/dir-spec.txt	2007-03-15 15:55:26 UTC (rev 9828)
+++ tor/trunk/doc/spec/dir-spec.txt	2007-03-15 16:27:57 UTC (rev 9829)
@@ -841,9 +841,9 @@
    feature is supported by the router or protocol versions in more than half
    of the live networkstatus's "v" entries for that router.  In other words,
    if the "v" entries for some router are:
-       v Tor 0.0.8pre1
-       v Tor 0.1.2.11
-       v FutureProtocolDescription 99
+       v Tor 0.0.8pre1                (from authority 1)
+       v Tor 0.1.2.11                 (from authority 2)
+       v FutureProtocolDescription 99 (from authority 3)
    then the client should believe that the router supports any feature
    supported by 0.1.2.11.
 

Modified: tor/trunk/src/or/test.c
===================================================================
--- tor/trunk/src/or/test.c	2007-03-15 15:55:26 UTC (rev 9828)
+++ tor/trunk/src/or/test.c	2007-03-15 16:27:57 UTC (rev 9829)
@@ -1192,7 +1192,7 @@
   tor_snprintf(buf, sizeof(buf), "%lu", tor_get_thread_id());
   cp = tor_strdup(buf);
 
-  for (i=0; i<1000; ++i) {
+  for (i=0; i<100000; ++i) {
     tor_mutex_acquire(_thread_test_mutex);
     strmap_set(_thread_test_strmap, "last to run", cp);
     tor_mutex_release(_thread_test_mutex);