commit 68a10b695022b96ed36a53594e11195245e0af62
Merge: 1e9df8e 293aca9
Author: Nick Mathewson <[email protected]>
Date: Mon Nov 7 11:02:07 2016 -0500
Merge branch 'maint-0.2.9' into release-0.2.9
changes/bug20534 | 6 ++++--
changes/bug20593 | 6 ++++++
src/or/config.c | 4 ++--
src/or/directory.c | 28 ++++++++++++++++++----------
4 files changed, 30 insertions(+), 14 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
