commit 7898135a7bbef5cc2acceb8a8d3175704c8b0732 Merge: de83a6e 7cb8850 Author: Erinn Clark erinn@torproject.org Date: Sun Jan 6 23:18:43 2013 +0100

Merge branch 'maint-2.3' into maint-2.4

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