commit 25dddf7a8f30699242b52fce115f29401f63ee9c Merge: 74a534b e602c40 Author: Nick Mathewson nickm@torproject.org Date: Thu Jun 13 09:40:32 2013 -0400

Merge remote-tracking branch 'public/bug8822' into maint-0.2.4

changes/bug8822 | 5 +++++ src/or/control.c | 6 ++---- src/or/dirserv.c | 2 +- src/or/microdesc.c | 26 ++++++++++++++++++++++---- 4 files changed, 30 insertions(+), 9 deletions(-)