[tor-commits] [tor/maint-0.2.9] Merge remote-tracking branch 'teor/bug20864-029' into maint-0.2.9

[nickm at torproject.org]

commit a23c581d13c164752effa9ccfa840192187f1388
Merge: 0d0c7a1 ebf243b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Dec 5 08:10:48 2016 -0500

    Merge remote-tracking branch 'teor/bug20864-029' into maint-0.2.9

 changes/bug20864   |  4 ++++
 src/test/test_hs.c | 13 ++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)