[tor-commits] [tor/master] Merge branch 'bug6173_rebased'

[nickm at torproject.org]

commit 4cbd6e46ef6d64e293dd03b0c453a2750684563a
Merge: 4432fa4 8c01581
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 18 11:52:03 2012 -0400

    Merge branch 'bug6173_rebased'

 acinclude.m4    |    9 ++++++---
 changes/bug6173 |    5 +++++
 2 files changed, 11 insertions(+), 3 deletions(-)