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

[arma at torproject.org]

commit a26a5794a308ce30c5d2cf8d16e57903cbf9c8fb
Merge: d5f0501 8f9fb63
Author: Roger Dingledine <arma at torproject.org>
Date:   Sat Oct 12 10:48:30 2013 -0400

    Merge branch 'maint-0.2.4'

 changes/bug9946     |   11 +++++++++++
 src/or/entrynodes.c |   22 +++++++++++++++++-----
 2 files changed, 28 insertions(+), 5 deletions(-)