commit 69771bb5fc0fc472436c5f3fe6dfd3bd0f4929da Merge: ef5b368 668f7a2 Author: Nick Mathewson <[email protected]> Date: Tue Dec 21 15:44:50 2010 -0500
Merge remote branch 'public/bug2190_021' into maint-0.2.1
changes/bug2190 | 6 ++++++
src/common/log.c | 14 +++++++++-----
src/common/log.h | 4 ++++
3 files changed, 19 insertions(+), 5 deletions(-)
