[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug1938'

[nickm at torproject.org]

commit 155543d26e21f992237c2fff159869cc663ae049
Merge: 11bf558 8f070ec
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 31 12:24:02 2012 -0400

    Merge remote-tracking branch 'public/bug1938'

 changes/bug1938    |    4 ++++
 src/or/directory.c |    5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)