[tor-commits] [tor/master] Merge remote-tracking branch 'ffmancera/github/bug24677'

[nickm at torproject.org]

commit 5051cfe9bd66aa68c6825c00e107f759c921a9ff
Merge: f5d89fab2 3871c102a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jan 2 09:37:23 2018 -0500

    Merge remote-tracking branch 'ffmancera/github/bug24677'

 Makefile.am         | 10 ++++++----
 changes/ticket24677 |  4 ++++
 2 files changed, 10 insertions(+), 4 deletions(-)