[tor-commits] [tor/master] Merge branch 'bug22805_v2_squashed'

[nickm at torproject.org]

commit 91467e04b18afce9af2189116ad0e160fef53e49
Merge: 512c57cff 95a7e7e92
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 22 08:58:17 2017 -0400

    Merge branch 'bug22805_v2_squashed'

 changes/bug22805         | 10 ++++++++++
 src/or/channel.c         | 16 +++++++++++++++-
 src/or/channel.h         |  3 ++-
 src/or/channelpadding.c  |  2 +-
 src/or/circuitbuild.c    |  4 ++--
 src/or/circuituse.c      |  6 +++---
 src/or/command.c         | 12 +-----------
 src/or/connection_edge.c |  9 +++++----
 src/or/or.h              |  3 ---
 9 files changed, 39 insertions(+), 26 deletions(-)