[tor-commits] [tor/master] Merge remote-tracking branch 'sebastian/coverity'

[nickm at torproject.org]

commit 4f47db328048f4a59549ccda534c8d3f74f655aa
Merge: 15d99fe 60c330a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Dec 5 11:56:03 2011 -0500

    Merge remote-tracking branch 'sebastian/coverity'

 changes/bug4637    |    3 +++
 src/or/directory.c |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)