commit 72f775e18416300bd230f5784dc779db6138537b Merge: 25dddf7 2338681 Author: Nick Mathewson nickm@torproject.org Date: Thu Jun 13 21:58:36 2013 -0400

Merge branch 'bug9047' into maint-0.2.4

changes/bug9047 | 6 ++++++ src/common/compat.c | 15 +++++++++++++++ src/common/compat.h | 1 + src/or/microdesc.c | 19 +++++++++++++------ 4 files changed, 35 insertions(+), 6 deletions(-)