[tor-commits] [tor/release-0.2.7] Merge branch 'bug18977_026_v2' into maint-0.2.7

[nickm at torproject.org]

commit 4165b1a0da893a9f67a2ba32b4fcd54a7804ce14
Merge: d40e869 20b01ce
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 12 15:33:35 2016 -0400

    Merge branch 'bug18977_026_v2' into maint-0.2.7

 changes/bug18977    | 4 ++++
 src/common/compat.c | 4 ++++
 src/common/util.c   | 2 ++
 3 files changed, 10 insertions(+)