commit a9b2e5eac6168a1eb09da8d6d3ff43b08cc51411 Merge: 8eed82b a3fe8b1 Author: Nick Mathewson <[email protected]> Date: Wed Sep 10 22:12:47 2014 -0400
Merge remote-tracking branch 'public/bug12908_025' into maint-0.2.5
changes/bug12908 | 4 ++++
src/or/config.c | 7 +++++++
2 files changed, 11 insertions(+)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
