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

[nickm at torproject.org]

commit aa3126b5b4c1d3144941f069afbaa83b9bf99e20
Merge: e4c5001 e270a06
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Mar 10 23:03:17 2013 -0400

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

 changes/6783_big_hammer |    6 ++++++
 src/or/config.c         |    5 +++++
 src/or/directory.c      |   13 +++++++++++++
 src/or/or.h             |   11 +++++++++++
 4 files changed, 35 insertions(+), 0 deletions(-)