[tor-commits] [tor/master] Merge branch 'ticket13172'

[nickm at torproject.org]

commit 2170171d84e30bc4b1b2565255bd978668c50e97
Merge: d85270e 00f5909
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Nov 12 13:25:17 2014 -0500

    Merge branch 'ticket13172'

 changes/ticket13172 |    4 ++++
 src/common/compat.h |    9 +++++++++
 2 files changed, 13 insertions(+)