[tor-commits] [tor/master] Merge remote-tracking branch 'arma/bug16844-logs'

commit a7de5bd02e54afcacc9d7e5a7a95fd8856228c5b Merge: eafae7f b4732bd Author: Nick Mathewson <nickm@torproject.org> Date: Tue Aug 18 09:19:39 2015 -0400 Merge remote-tracking branch 'arma/bug16844-logs' src/or/circuituse.c | 3 +++ src/or/connection_edge.c | 3 ++- src/or/relay.c | 12 ++++++++---- 3 files changed, 13 insertions(+), 5 deletions(-)