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

[nickm at torproject.org]

commit 9de456a303f1931bef43e5a48afdf08293279c45
Merge: 30b8fc3 b8abade
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 8 16:47:49 2013 -0400

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

 changes/bug9904      |    4 ++++
 src/common/address.c |    2 ++
 2 files changed, 6 insertions(+)