[tor-commits] [tor/master] Merge branch 'ticket16901'

[nickm at torproject.org]

commit 0e60c52c6cf1863866a37dcb694823b21898eaf3
Merge: d891e2a b79e90f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 1 10:42:47 2015 -0400

    Merge branch 'ticket16901'

 changes/bug16901 |    3 +++
 configure.ac     |   10 ++++++++++
 2 files changed, 13 insertions(+)