[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
nickm at torproject.org
nickm at torproject.org
Mon Nov 7 16:02:23 UTC 2016
commit 68a10b695022b96ed36a53594e11195245e0af62
Merge: 1e9df8e 293aca9
Author: Nick Mathewson <nickm at torproject.org>
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(-)
More information about the tor-commits
mailing list