commit 04d4786cc40b2d80b4cd34e7d5339b0100861c8f Merge: 151d5eded c50c98ba6 Author: Nick Mathewson <ni...@torproject.org> Date: Tue Oct 31 11:43:07 2017 -0400
Merge remote-tracking branch 'public/bug23693_029' into maint-0.2.9
changes/bug23693 | 6 ++++++
src/or/config.c | 1 +
2 files changed, 7 insertions(+)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
