[tor-commits] [tor/release-0.3.3] Merge branch 'bug25581_033_v2_asn_squashed' into maint-0.3.3

[nickm at torproject.org]

commit 0803d79f55e0554c8f9c479112f3a317a97b4ddf
Merge: f9ba0c654 8b8630a50
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Apr 11 15:37:56 2018 -0400

    Merge branch 'bug25581_033_v2_asn_squashed' into maint-0.3.3

 changes/bug25581 |  4 ++++
 doc/tor.1.txt    | 20 ++++++++++----------
 src/or/config.c  |  7 +++++--
 3 files changed, 19 insertions(+), 12 deletions(-)