[tor-commits] [tor/master] Merge remote-tracking branch 'arma/bug6759'

[nickm at torproject.org]

commit 05ded76cb6791d5f9472e39c9e3ebb64f450d219
Merge: 3da9a14 2131cc1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 4 10:18:51 2012 -0400

    Merge remote-tracking branch 'arma/bug6759'

 changes/bug6759    |    6 ++++++
 src/or/config.c    |    2 +-
 src/or/microdesc.c |    6 +++---
 3 files changed, 10 insertions(+), 4 deletions(-)