commit bba47a836c2fa0e55805c3871b5851b97a014bdb Merge: 750b511 bc532bb Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 19 12:30:36 2011 -0400

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

changes/osx_forgotten_compilefix | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)