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

[nickm at torproject.org]

commit e573a519168d3746d429d27702e6e8a46e56411a
Merge: 6bf06c5 9063f29
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Mar 12 12:52:10 2015 -0400

    Merge branch 'maint-0.2.5' into release-0.2.5

 changes/bug15205    |    5 +++++
 src/common/compat.h |   12 ++++++++++++
 2 files changed, 17 insertions(+)