commit 6eb7f2f889d9e047ea75bad15531d4aff4dbc711 Merge: dece40f bfe56e0 Author: Nick Mathewson nickm@torproject.org Date: Thu Oct 10 10:53:27 2013 -0400

Merge remote-tracking branch 'public/bug9928' into maint-0.2.3

changes/bug9928 | 6 ++++++ src/common/util.c | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-)