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

[nickm at torproject.org]

commit 95ccb1e812ef1a1c38bd3275b2bbf6b95e0c490d
Merge: 9a4e9b4 8aded5b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Apr 13 18:29:25 2013 -0400

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

 changes/fix-geoipexclude-doc |    4 ++++
 doc/tor.1.txt                |    4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)