commit 8c643b51bfa18a82d6424a7b8917f7fbe96feb6e Merge: 5da9f72 92bea30 Author: Nick Mathewson nickm@torproject.org Date: Thu Aug 11 11:53:03 2011 -0400

Merge remote-tracking branch 'origin/maint-0.2.2'

changes/bug3643 | 4 ++++ configure.in | 9 +++++++++ 2 files changed, 13 insertions(+), 0 deletions(-)