commit 7596949e64511a5727a7d0b76a3c3f57174a5cdf Merge: 1166edb 9eadcc9 Author: Erinn Clark erinn@torproject.org Date: Thu Oct 31 21:04:52 2013 -0200

Merge branch 'maint-2.4'

README.LINUX-2.4 | 6 +++--- README.OSX-2.4 | 6 +++--- README.WIN-2.4 | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-)