[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.0

[nickm at torproject.org]

commit 8bc70a2ad2c0363986e4b002ceaf259908d67e70
Merge: d9427c0 bb97f68
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 5 11:19:03 2017 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug22801  |  5 +++++
 src/common/util.c | 12 ++++++++++++
 2 files changed, 17 insertions(+)