[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'

[nickm at torproject.org]

commit b0f7af16156ef7d0c401485c6e7a533857f7b316
Merge: 899c280 01407f9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 18 16:34:29 2013 -0400

    Merge remote-tracking branch 'origin/maint-0.2.4'

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