[tor-commits] [tor/master] Merge remote-tracking branch 'asn/bug21971'

[nickm at torproject.org]

commit afe1af7de6787e1f63dadde798b7f806be0c138b
Merge: eeb266c 0c39cef
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 18 21:38:28 2017 -0400

    Merge remote-tracking branch 'asn/bug21971'

 src/test/test_circuitlist.c   | 16 ++++++++--------
 src/test/test_hs_intropoint.c |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)