[tor-commits] [tor/master] Merge branch 'teor_connection-with-client-v2_squashed'

[nickm at torproject.org]

commit 7bc9f93abbfcabba1acde441b5fac98d4676c08e
Merge: a91f948 f9af7e8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 2 19:18:04 2017 -0400

    Merge branch 'teor_connection-with-client-v2_squashed'

 changes/bug21406    |  5 +++++
 src/or/channel.h    |  4 ++--
 src/or/channeltls.c |  4 ++++
 src/or/command.c    | 10 ++++++++--
 src/or/or.h         |  4 ----
 5 files changed, 19 insertions(+), 8 deletions(-)