commit 2c86380bdec15272652607025a6fb46eb54aeef8 Merge: 30b13fd 681812e Author: Nick Mathewson nickm@torproject.org Date: Fri Apr 7 09:48:18 2017 -0400

Merge remote-tracking branch 'argonblue/baseXXlen'

src/common/util.h | 6 +++--- src/common/util_format.c | 26 +++++++++++++------------- src/common/util_format.h | 20 ++++++++++++++++++++ src/or/shared_random.h | 9 +++------ 4 files changed, 39 insertions(+), 22 deletions(-)