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

[nickm at torproject.org]

commit 9807da9c20d5504a1669c70c1607b40731664e07
Merge: a7a060a63 6d9382049
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Nov 7 10:47:29 2018 -0500

    Merge branch 'ticket27225_squashed'

 changes/ticket27225    |  5 +++
 src/app/main/main.c    |  2 ++
 src/core/or/versions.c | 82 +++++++++++++++++++++++++++++++++++++++++---------
 src/core/or/versions.h |  2 ++
 4 files changed, 76 insertions(+), 15 deletions(-)