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

[nickm at torproject.org]

commit 51841709bf2d709c54ee0fa27830533020b2a7d7
Merge: 4314d1a b3abf15
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 24 11:41:24 2012 -0400

    Merge remote-tracking branch 'public/bug5103'

 changes/bug5103 |    3 +++
 configure.in    |    7 ++++++-
 2 files changed, 9 insertions(+), 1 deletions(-)