diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-03-14 12:06:58 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-03-14 12:06:58 -0400 |
| commit | 9be3389dc70fc36c29f8ba97c7d642eecb8a5789 (patch) | |
| tree | 2a257937ce7c9ba78ba0cd1e998f6070c6942014 | |
| parent | d89b8e075116ae28e1a168d8fecc9a901a736a17 (diff) | |
| parent | 653b09e1ec27bc2c8676c3c1ec40264972540637 (diff) | |
| download | tor-9be3389dc70fc36c29f8ba97c7d642eecb8a5789.tar.gz tor-9be3389dc70fc36c29f8ba97c7d642eecb8a5789.zip | |
Merge remote-tracking branch 'origin/maint-0.2.4'
| -rw-r--r-- | changes/bug8477-easypart | 3 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/or/circuitlist.c | 3 |
3 files changed, 7 insertions, 1 deletions
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/configure.ac b/configure.ac index 3dcf90a54a..0ac8255f2f 100644 --- a/configure.ac +++ b/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 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; |