commit 157fe34aa28e4c66dbdae5a9f1750241db6836c3 Merge: 06557b2 fe52948 Author: Erinn Clark <erinn@torproject.org> Date: Thu Oct 25 11:19:46 2012 +0100 Merge branch 'maint-2.2' into maint-2.3 build-scripts/versions.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)