From 051b1e8ac4114fb23904cdf8dead72d585904e0a Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Mon, 11 Mar 2013 16:29:06 -0400 Subject: [PATCH 1/2] Look at the right variable when warning about signed size_t. In 81d69f4c2d8a451 (0.2.21-alpha) we added a compile-time check for a (totally broken) signed size_t. In 0e597471af (not yet released) I switched to a better configure-time check, which stored its output in a different variable. I didn't change the code which looked at the output, however. This bug is not in any released version of Tor, and would not affect anybody with a working Tor. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 864477b8fc..4bc0db363f 100644 --- a/configure.ac +++ b/configure.ac @@ -980,7 +980,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 From 653b09e1ec27bc2c8676c3c1ec40264972540637 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Thu, 14 Mar 2013 12:06:03 -0400 Subject: [PATCH 2/2] Make circuit_purpose_to_string handle CIRCUIT_PURPOSE_PATH_BIAS_TESTING --- changes/bug8477-easypart | 3 +++ src/or/circuitlist.c | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 changes/bug8477-easypart diff --git a/changes/bug8477-easypart b/changes/bug8477-easypart new file mode 100644 index 0000000000..0f8f1031c5 --- /dev/null +++ b/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. diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 17e18c7603..d4c07fc82b 100644 --- a/src/or/circuitlist.c +++ b/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;