[tor-commits] [tor/release-0.2.4] Merge remote-tracking branch 'public/bug9645' into maint-0.2.4

[arma at torproject.org]

commit 5cc155e02a995fda828ff33b105040b2bd96a650
Merge: db2c2a6 264aa27
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Oct 31 16:09:41 2013 -0400

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

 changes/bug9645a   |    5 +++++
 src/or/microdesc.c |    9 ++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)