[tor-commits] [tor/master] Merge remote-tracking branch 'teor/bug17887-v2'

[nickm at torproject.org]

commit 7616922e8136d5d63661cfdfc4802608b16fdef7
Merge: 3074b83 430181f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jan 12 10:47:54 2016 -0500

    Merge remote-tracking branch 'teor/bug17887-v2'

 changes/bug17887                    |    6 ++++
 scripts/maint/updateFallbackDirs.py |   54 +++++++++++++++++++++++------------
 2 files changed, 41 insertions(+), 19 deletions(-)