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

[nickm at torproject.org]

commit f43fee8f8f194af475932f5312b2e538770d3c94
Merge: 14efaa0 904dd43
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Apr 30 17:21:15 2014 -0400

    Merge remote-tracking branch 'public/bug11628'

 changes/bug11628 |    4 ++++
 configure.ac     |    9 +++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)