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

[nickm at torproject.org]

commit d062baac86c824f8a3ddfead3a8c88b3f87068c1
Merge: 7616922 bc2bed8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jan 12 12:26:06 2016 -0500

    Merge remote-tracking branch 'teor/bug17888'

 changes/bug17888                    |    6 ++++++
 scripts/maint/updateFallbackDirs.py |    2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)