Browse Source

Merge remote-tracking branch 'origin/maint-0.2.4'

Nick Mathewson 12 years ago
parent
commit
9be3389dc7
3 changed files with 7 additions and 1 deletions
  1. 3 0
      changes/bug8477-easypart
  2. 1 1
      configure.ac
  3. 3 0
      src/or/circuitlist.c

+ 3 - 0
changes/bug8477-easypart

@@ -0,0 +1,3 @@
+  o Minor bugfixes:
+    - Log the purpose of a path-bias testing circuit correctly.
+      Improves a log message from bug 8477; bugfix on 0.2.4.8-alpha.  

+ 1 - 1
configure.ac

@@ -993,7 +993,7 @@ AX_CHECK_SIGN([size_t],
 #endif
 ])
 
-if test "$tor_cv_size_t_signed" = yes; then
+if test "$ax_cv_decl_size_t_signed" = yes; then
   AC_MSG_ERROR([You have a signed size_t; that's grossly nonconformant.])
 fi
 

+ 3 - 0
src/or/circuitlist.c

@@ -531,6 +531,9 @@ circuit_purpose_to_string(uint8_t purpose)
     case CIRCUIT_PURPOSE_CONTROLLER:
       return "Circuit made by controller";
 
+    case CIRCUIT_PURPOSE_PATH_BIAS_TESTING:
+      return "Path-bias testing circuit";
+
     default:
       tor_snprintf(buf, sizeof(buf), "UNKNOWN_%d", (int)purpose);
       return buf;