commit 11bf5585aafa4ea590b4f4b62a75323fb5907d95 Merge: 32d6aca 0da40bb Author: Nick Mathewson <nickm@torproject.org> Date: Thu May 31 12:22:02 2012 -0400 Merge remote-tracking branch 'public/bug2954_more' changes/bug2954_more | 4 ++++ src/or/microdesc.c | 14 ++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-)