[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug11477'

[nickm at torproject.org]

commit 10174b00e7258cc8184e85c37a2a39b04a0df92e
Merge: 9736613 64f6288
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Apr 16 23:06:39 2014 -0400

    Merge remote-tracking branch 'public/bug11477'

 changes/bug11477 |    4 ++++
 configure.ac     |   19 +++++++++++++------
 2 files changed, 17 insertions(+), 6 deletions(-)