[tor-commits] [tor/master] Merge remote-tracking branch 'yawning/bug14740'

[nickm at torproject.org]

commit 377584abbd56ab6d585ccde893398068ada8fdaa
Merge: 5a0c94f b330bde
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Feb 5 10:59:44 2015 -0500

    Merge remote-tracking branch 'yawning/bug14740'

 changes/bug14740 |    5 +++++
 src/common/log.c |    6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)