commit 2776a6b8103e745a9be8fc181a2b10273289a5e1 Merge: 0c5a44e d98f299 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Aug 27 16:21:10 2012 -0400 Merge (with -s ours) remote-tracking branch 'origin/maint-0.2.3' We are doing this merge to avoid taking the patch from "nickm/disable_pathbias_warnings_v2" into 0.2.4 -- we're going to try to fix the pathbias code for real here.