[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/bug20307_030_01'

[nickm at torproject.org]

commit fc2656004ace977d886e8b8240a4d19de6825734
Merge: 94e8f60 955d4b7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jan 13 16:56:56 2017 -0500

    Merge remote-tracking branch 'dgoulet/bug20307_030_01'

 changes/bug20307 | 7 +++++++
 src/or/or.h      | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)