commit d74a78c58aa5483f6586f80a746422cd2798c000 Merge: 098cbcb d221b50 Author: Nick Mathewson nickm@torproject.org Date: Mon Feb 23 13:04:03 2015 -0500

Merge branch 'bug14950_logs_squashed'

src/common/compat.c | 4 ++-- src/or/circuitbuild.c | 6 +++++- src/or/control.c | 12 +++++++++--- src/or/control.h | 2 +- src/or/nodelist.c | 7 ++++--- src/or/status.c | 27 ++++++++++++++++++--------- 6 files changed, 39 insertions(+), 19 deletions(-)