[tor-commits] [tor/release-0.2.6] Merge remote-tracking branch 'public/bug15205_025' into maint-0.2.6

[nickm at torproject.org]

commit 1af67d7f72470cec1de5e2a75186edc3b3accfbe
Merge: 7c9be64 24c031b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 9 19:47:12 2015 -0400

    Merge remote-tracking branch 'public/bug15205_025' into maint-0.2.6

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