[tor-commits] [tor/release-0.2.4] Merge remote-tracking branch 'public/bug7143_v2' into maint-0.2.4

[arma at torproject.org]

commit b00a6211c5680ae79732d701732f7481cf353526
Merge: 42731f6 3dc52e6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Apr 17 10:49:59 2013 -0400

    Merge remote-tracking branch 'public/bug7143_v2' into maint-0.2.4

 changes/bug7143   |    4 ++++
 src/or/include.am |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)