commit 4ce3bacfc94799cf6b96734499052ddd46ae8a13 Merge: 385cd81 d58705d Author: Erinn Clark erinn@torproject.org Date: Sun Dec 2 09:05:27 2012 +0000

Merge branch 'maint-2.3' into maint-2.4

changelog.linux-2.3 | 3 ++- changelog.osx-2.3 | 3 ++- changelog.windows-2.3 | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-)