commit 0b3166fffa0e5e19c63fd95538f87d634444d28c Merge: 330116f 9da4e25 Author: Nick Mathewson nickm@torproject.org Date: Mon May 9 13:20:04 2011 -0400

Merge branch 'clang_fixes' into maint-0.2.2

changes/dirvote_null_deref | 4 ++++ changes/mdesc_null_deref | 5 +++++ src/or/circuitbuild.c | 12 +++++++++++- src/or/connection.c | 2 +- src/or/connection_or.c | 3 +-- src/or/control.c | 5 ++++- src/or/dirvote.c | 6 +++--- src/or/microdesc.c | 2 +- src/or/or.h | 4 +++- 9 files changed, 33 insertions(+), 10 deletions(-)