commit e2fac8a4921a1e0fe3ecff84a1ba159150a63d2e Merge: 0f92e65 5b02117 Author: Erinn Clark erinn@torproject.org Date: Fri Aug 17 22:09:43 2012 +0100

Merge branch 'maint-2.3'

build-scripts/recommended-versions | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)