commit d98f2996b0b7b8629ac05662976cb3e4f100efcd Merge: bffe0d3 b252ffa Author: Nick Mathewson nickm@torproject.org Date: Mon Aug 27 16:19:52 2012 -0400

Merge branch 'disable_pathbias_warnings_v2' into maint-0.2.3

changes/disable_pathbias_messages | 3 +++ src/or/circuitbuild.c | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 10 deletions(-)