commit 0ddd8f06a9e0c1ff3f5b5ede7e2a274d303645ea Merge: 162fd52 fa81508 Author: Nick Mathewson nickm@torproject.org Date: Wed Apr 1 12:47:16 2015 -0400

Merge remote-tracking branch 'yawning/feature15471'

changes/feature15471 | 5 +++++ src/common/util.c | 18 ++++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-)