commit 6b6942bbe9553e51f306d517f3e6367c5a189e7a Merge: 8661230 2e5148c Author: Erinn Clark erinn@torproject.org Date: Mon Jun 10 21:06:44 2013 -0300

Merge branch 'maint-2.4'

build-scripts/linux.mk | 2 +- changelog.linux-2.3 | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-)