12 May
2016
12 May
'16
7:35 p.m.
commit 24fbb9a81b19cc20df9a204d3203d1b914fb267d Merge: 28e1aa1 4e94580 Author: Nick Mathewson nickm@torproject.org Date: Wed May 11 13:15:17 2016 -0400
Merge branch 'maint-0.2.7' into maint-0.2.8
changes/bug19032 | 4 ++++ src/or/dirserv.c | 31 ++++++++++++++++--------------- src/or/dirserv.h | 2 +- src/or/networkstatus.c | 3 +-- 4 files changed, 22 insertions(+), 18 deletions(-)