[tor-commits] [tor/master] Merge remote-tracking branch 'asn2/bug3336'

[nickm at torproject.org]

commit d25d08dc4dceef484206c932648023b36cf3ec7c
Merge: 8cd5a3c 9eab601
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 6 18:34:45 2011 -0400

    Merge remote-tracking branch 'asn2/bug3336'

 src/common/log.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)