r12182@catbus: nickm | 2007-03-15 10:58:12 -0400

 Clarify section of dir-spec.txt that explains how "v" resolution happens.

svn:r9829

diff --git a/doc/spec/dir-spec.txt b/doc/spec/dir-spec.txt
index bd3d57a34d8945bddbba83c25c76109eb1749a12..be13e4ce8c334a18c5c47b71f9059ff08165417d 100644 (file)
--- a/doc/spec/dir-spec.txt
+++ b/doc/spec/dir-spec.txt
@@ -841,9 +841,9 @@ $Id$
    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.
 

diff --git a/src/or/test.c b/src/or/test.c
index f707551b2facf7a10587b4b37da356cab9714eaf..03a589c2c021695480cacc0de2d5b8febf7a6ebb 100644 (file)
--- a/src/or/test.c
+++ b/src/or/test.c
@@ -1192,7 +1192,7 @@ _thread_test_func(void* _s)
   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);