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

[nickm at torproject.org]

commit 6177674a5b0bba4deea3842195654c59def08f73
Merge: e26f38702 831d3b794
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Nov 18 11:03:16 2017 -0500

    Merge branch 'maint-0.2.5' into release-0.2.5

 changes/bug18329-minimal | 6 ++++++
 src/or/router.c          | 9 +++++++++
 2 files changed, 15 insertions(+)