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

[nickm at torproject.org]

commit 2c0088b8aa360c8dfa4c38c45d50542fa9aae8fb
Merge: 1ccc282 d6e6eab
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Feb 12 09:17:11 2014 -0500

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

 src/or/reasons.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)