commit 561d9880f8025ddbcb2f0a586d0677908320af4f Merge: 3d51545 46b3b62 Author: Nick Mathewson nickm@torproject.org Date: Tue Dec 17 13:53:11 2013 -0500

Merge branch 'bug10423' into maint-0.2.4

changes/bug10423 | 4 ++++ src/or/microdesc.c | 33 ++++++++++++++++++++++----------- 2 files changed, 26 insertions(+), 11 deletions(-)