[tor-commits] [tor/master] Merge remote-tracking branch 'linus/bug6797'

[nickm at torproject.org]

commit 0ab7716b9ec0deebfa3124ffc2c7a7f0b0d705e6
Merge: 344bb1d 93ee622
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 10 10:19:57 2012 -0400

    Merge remote-tracking branch 'linus/bug6797'

 changes/bug6797  |    3 +++
 src/or/dirserv.c |    4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)