commit 08436b27ffba4094760fd1fe5321bbd255043b53 Merge: e1c7d12 e567b44 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Nov 8 20:00:54 2012 -0500 Merge remote-tracking branch 'origin/maint-0.2.3' src/common/util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)