commit 23054543278a8ee5db6d8dae3b3a96e2b2fd5377 Merge: 4842477 b1ee192 Author: Nick Mathewson nickm@torproject.org Date: Tue Jan 31 11:25:29 2012 -0500

Merge remote-tracking branch 'arma/bug4013'

changes/bug4013 | 6 ++++++ src/or/circuitbuild.c | 30 +++++++++++++++++++++++++++++- src/or/circuitbuild.h | 2 ++ src/or/directory.c | 14 +++++++++----- src/or/microdesc.c | 11 +++++++++-- src/or/routerparse.c | 15 ++++++++------- src/or/routerparse.h | 3 ++- 7 files changed, 65 insertions(+), 16 deletions(-)