commit 25c3ff4500f912f3a9d19003bc6dab9cf6f00312 Merge: 112c554 7bed9dc Author: Nick Mathewson <nickm@torproject.org> Date: Tue Mar 24 14:59:09 2015 -0400 Merge remote-tracking branch 'public/bug15269' changes/bug15269 | 7 +++++++ src/common/log.c | 12 +++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-)