[tor-commits] [tor/release-0.2.4] Merge branch 'maint-0.2.4' into release-0.2.4

[nickm at torproject.org]

commit a8d6eb30b88ec56e2bdef9d8a12ff308fa0223b5
Merge: 6b2ed1a e2112dd
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 20 10:26:19 2014 -0400

    Merge branch 'maint-0.2.4' into release-0.2.4
    
    Conflicts:
    	configure.ac

 changes/bug13471 |    5 +++++
 configure.ac     |    2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)