[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/bug20646_030_01'

[nickm at torproject.org]

commit b7db39e88ab6d97a5a0a5f1ff7e0d5b73e51e05e
Merge: fe711c2 6b13612
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Nov 17 20:08:00 2016 -0500

    Merge remote-tracking branch 'dgoulet/bug20646_030_01'

 changes/bug20646  |  5 +++++
 src/common/util.c | 15 ++++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)