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

[nickm at torproject.org]

commit 9be3389dc70fc36c29f8ba97c7d642eecb8a5789
Merge: d89b8e0 653b09e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Mar 14 12:06:58 2013 -0400

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

 changes/bug8477-easypart |    3 +++
 configure.ac             |    2 +-
 src/or/circuitlist.c     |    3 +++
 3 files changed, 7 insertions(+), 1 deletions(-)