19 Dec
2016
19 Dec
'16
12:31 p.m.
commit b83a5ee11f7edc9361905aac25787efeefa03278 Merge: a8b6998 169a93f Author: Nick Mathewson nickm@torproject.org Date: Mon Dec 19 07:30:55 2016 -0500
Merge branch 'maint-0.2.9' into release-0.2.9
changes/ticket20170-v3 | 5 + src/or/fallback_dirs.inc | 392 ++++++++++++++++++++++++++++++++--------------- 2 files changed, 272 insertions(+), 125 deletions(-)