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

[nickm at torproject.org]

commit bc9121d5c99de17b350c2e4f646160b53f1c832c
Merge: 0740d67 19e25d5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Feb 3 10:35:23 2017 -0500

    Merge branch 'bug21372_squashed'

 changes/bug21372      | 4 ++++
 src/or/circuitbuild.c | 5 +++--
 src/or/control.c      | 7 ++-----
 src/or/rendservice.c  | 3 +++
 4 files changed, 12 insertions(+), 7 deletions(-)