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

[nickm at torproject.org]

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

    Merge branch 'maint-0.3.2' into release-0.3.2

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