commit b8669ef72f43244ed93a657c9c075b19d76b933c Merge: 884d629 a5fb24b Author: Erinn Clark erinn@torproject.org Date: Fri Sep 20 21:12:47 2013 +0200

Merge branch 'maint-2.4'

build-scripts/recommended-versions | 6 ++++++ 1 file changed, 6 insertions(+)