[tor-commits] [tor/master] Merge remote-tracking branch 'sebastian/bug20064'

[nickm at torproject.org]

commit 2a3b65179056bdd55382434d610ef3ca89860783
Merge: 3823d0a f4ed254
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Sep 7 11:38:43 2016 -0400

    Merge remote-tracking branch 'sebastian/bug20064'

 changes/bug20064  | 5 +++++
 doc/tor.1.txt     | 4 +++-
 src/or/policies.c | 4 +++-
 3 files changed, 11 insertions(+), 2 deletions(-)