mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 22:58:50 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Nick Mathewson 2013-03-14 12:06:58 -04:00
commit 9be3389dc7
3 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changes/bug8477-easypart Normal file
View file

@ -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.

2
configure.ac
View file

@ -993,7 +993,7 @@ AX_CHECK_SIGN([size_t],
#endif #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.]) AC_MSG_ERROR([You have a signed size_t; that's grossly nonconformant.])
fi fi

3
src/or/circuitlist.c
View file

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