commit f12d3fe9aa3d2f97eb1750e30b812358ecdd9139 Merge: adfcc1d 561d988 Author: Nick Mathewson nickm@torproject.org Date: Tue Dec 17 13:54:02 2013 -0500

Merge remote-tracking branch 'origin/maint-0.2.4'

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