commit 6f87aa3371ff3542c58c0083e9f44c470103d94d Merge: 96e3936 13298d9 Author: Nick Mathewson nickm@torproject.org Date: Fri Oct 31 08:52:07 2014 -0400

Merge commit '13298d90a90dc62d21d38f910171c9b57a8f0273'

changes/spurious-clang-warnings | 10 ++++++++++ src/common/compat.c | 9 +++++---- src/common/compat.h | 9 +++++---- src/common/crypto_pwbox.c | 2 +- src/ext/ht.h | 3 ++- src/ext/tor_queue.h | 23 +++++++++++++++-------- src/or/channeltls.c | 4 ++-- src/or/circuitmux_ewma.c | 4 ++-- src/or/connection.h | 3 ++- src/or/or.h | 5 +++-- 10 files changed, 47 insertions(+), 25 deletions(-)