commit 34edf17d88a5eaf7bd10aaa557ac5af5c85fa71f Merge: e8386cc 6d8a2ff Author: Nick Mathewson nickm@torproject.org Date: Tue Jun 2 14:51:13 2015 -0400

Merge remote-tracking branch 'teor/bug16115-minor-fixes'

changes/bug16115-NULL-getinfo-onions | 4 ++++ changes/bug16115-init-var | 4 ++++ changes/bug16115-signing-key-NULL-check | 6 ++++++ changes/bug16115-spawn-comment | 6 ++++++ changes/bug16115-undef-directive-in-macro | 6 ++++++ changes/bug16115-unused-find-cipher | 7 +++++++ src/common/compat_pthreads.c | 3 ++- src/common/tortls.c | 2 ++ src/or/control.c | 10 +++++++--- src/or/rendcommon.c | 2 +- src/or/routerkeys.c | 3 ++- src/test/test_util.c | 7 +++---- 12 files changed, 50 insertions(+), 10 deletions(-)