commit 5dbb0bdae934f56c34e48b52cecc973ea400805b Merge: 060e0d0 6cc3397 Author: Nick Mathewson <nickm@torproject.org> Date: Mon May 16 08:33:53 2016 -0400 Merge branch 'maint-0.2.8' scripts/maint/updateFallbackDirs.py | 57 +++++++++++++++++++++++-------------- 1 file changed, 35 insertions(+), 22 deletions(-)