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

[arma at torproject.org]

commit 01407f9718a7b1eb4e43b46c2799a390551aad29
Merge: dbdc994 fca578d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 18 16:33:47 2013 -0400

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

 changes/bug8062 |    5 +++++
 src/or/or.h     |    4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)