commit 01e7f42a09108e71cede46d4a038c4b1253a3d42 Merge: 6027429 0cf90ba Author: Nick Mathewson <[email protected]> Date: Wed May 4 15:23:26 2016 -0400
Merge branch 'bug18921_squashed' into maint-0.2.8
changes/bug18921 | 4 ++++
src/or/directory.c | 30 +++++++++++++++++++-----------
2 files changed, 23 insertions(+), 11 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
