commit 81fcebcd0541b13dce35969d0338da9b68eb1b0c Merge: 025dc19 b326e76 Author: Nick Mathewson nickm@torproject.org Date: Fri Dec 7 11:11:26 2012 -0500

Merge branch 'bug7306'

changes/bug7306 | 5 +++++ src/test/test_util.c | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-)