[tor-commits] [tor/master] Merge branch 'maint-0.3.2'

[nickm at torproject.org]

commit b780e84f256796870857259c16489e90a75a63c7
Merge: ea5ea5f55 3dc61a5d7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Nov 7 20:36:04 2017 -0500

    Merge branch 'maint-0.3.2'

 changes/bug23318    | 7 -------
 src/or/routerlist.c | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)