[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/bug21290_030_01'

[nickm at torproject.org]

commit ec1b8020d50d19ae3824a412a7205b39583a2e9b
Merge: 24551d6 5335a8e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Feb 1 10:44:45 2017 -0500

    Merge remote-tracking branch 'dgoulet/bug21290_030_01'

 changes/bug21290 |  7 +++++++
 configure.ac     | 29 +++++++++++++++++++++++++----
 2 files changed, 32 insertions(+), 4 deletions(-)