[tor-commits] [tor/master] Merge remote-tracking branch 'teor/bug18720'

[nickm at torproject.org]

commit 16f7851807995fd2b42f15b1303c8431d0f7ba38
Merge: 6720628 6a2b4db
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 5 10:08:11 2016 -0400

    Merge remote-tracking branch 'teor/bug18720'

 src/common/compat.h |  2 +-
 src/or/or.h         | 21 +++++++++++++--------
 2 files changed, 14 insertions(+), 9 deletions(-)