[tor-commits] [tor/master] Merge remote-tracking branch 'mikeperry/bug23101-mergeready-squashed'

[nickm at torproject.org]

commit 1bcbb1bb0b73794e34d1f10edbd50753eff0eb37
Merge: edd427a8b 489628a7e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jan 19 17:28:10 2018 -0500

    Merge remote-tracking branch 'mikeperry/bug23101-mergeready-squashed'

 changes/bug13837         |   4 +
 changes/bug23101         |   3 +
 doc/tor.1.txt            |  94 +++++++++++++++
 src/or/circuitbuild.c    | 290 +++++++++++++++++++++++++++++++++++++++++++----
 src/or/circuitbuild.h    |   1 +
 src/or/circuitlist.c     |  66 +++++++++--
 src/or/circuituse.c      | 228 ++++++++++++++++++++++++++++++++++---
 src/or/circuituse.h      |   3 +
 src/or/config.c          |   8 ++
 src/or/connection_edge.c |   2 +
 src/or/or.h              |  47 ++++++--
 11 files changed, 696 insertions(+), 50 deletions(-)