commit e8ed4657764effb4f16fd5721c13f3384fdd8db1 Merge: ed39621 296649f Author: Nick Mathewson nickm@torproject.org Date: Fri Oct 7 16:28:32 2011 -0400

Merge remote-tracking branch 'public/bug2430'

changes/bug2430 | 4 ++++ configure.in | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)