[tor-commits] [tor/master] Merge branch 'maint-0.2.9'

[nickm@xxxxxxxxxxxxxx]

commit 2dc522664420163eeea87b8a5bdab5eaabd9b2e2
Merge: ae89d97 169a93f
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Dec 19 07:31:19 2016 -0500

    Merge branch 'maint-0.2.9'

 changes/ticket20170-v3   |   5 +
 src/or/fallback_dirs.inc | 392 ++++++++++++++++++++++++++++++++---------------
 2 files changed, 272 insertions(+), 125 deletions(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits