[tor-commits] [tor/master] Merge remote-tracking branch 'teor/bug8976_01_028'

[nickm at torproject.org]

commit fe0d346a6df3d20f81a90c4cfe4de89046907961
Merge: 656e231 7275dd4
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Mar 11 11:11:38 2016 -0500

    Merge remote-tracking branch 'teor/bug8976_01_028'

 changes/bug8976       |  5 +++++
 src/or/circuitbuild.c | 15 +++++++++++++++
 src/or/circuitbuild.h |  1 +
 src/or/rendservice.c  | 12 ++++++++++++
 4 files changed, 33 insertions(+)