commit 0a0e513d42581a8ae110307d1bac58ddb89a8df1 Merge: 04f21f0 e76b072 Author: Nick Mathewson nickm@torproject.org Date: Fri Dec 23 10:56:36 2016 -0500

Merge remote-tracking branch 'dgoulet/bug20991_030_01'

src/or/hs_intropoint.c | 8 ++++++-- src/or/hs_service.c | 5 +++-- src/trunnel/hs/cell_establish_intro.c | 12 ++++++------ src/trunnel/hs/cell_establish_intro.h | 8 ++++---- src/trunnel/hs/cell_establish_intro.trunnel | 2 +- 5 files changed, 20 insertions(+), 15 deletions(-)