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

commit 78251e004f03eca93dfbdae2a2b6c18bff948bf2 Merge: 43f95e3 eb5d75e Author: Roger Dingledine <arma@torproject.org> Date: Thu Oct 10 21:25:01 2013 -0400 Merge branch 'maint-0.2.4' ChangeLog | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)