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

[nickm at torproject.org]

commit e8cc9f3edf21ff56ba16cf716e74eb1efba0b0f1
Merge: ce6f2d1 4165b1a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 12 15:33:47 2016 -0400

    Merge branch 'maint-0.2.7' into maint-0.2.8

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