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

[nickm at torproject.org]

commit 5dfec9f8335d0fa954ff5423a41e3e249547fd8d
Merge: 1e5cd1c bee1e46
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 17 16:05:09 2012 -0400

    Merge remote-tracking branch 'linus/bug6880'

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