[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/ticket25163_033_01'

[nickm at torproject.org]

commit 12b58ba551311db26ef6d769a5ee6eee9c294e01
Merge: a7440d9c9 93ebcc2b8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Feb 7 12:46:27 2018 -0500

    Merge remote-tracking branch 'dgoulet/ticket25163_033_01'

 changes/ticket25163    |   4 +
 src/or/channel.c       |   1 -
 src/or/circuitbuild.c  |  40 -------
 src/or/circuitbuild.h  |   1 -
 src/or/circuitlist.c   |   4 +-
 src/or/connection_or.c |   4 -
 src/or/rephist.c       | 281 ++-----------------------------------------------
 src/or/rephist.h       |   7 --
 8 files changed, 11 insertions(+), 331 deletions(-)