commit ef89fd142cda9881728410710e5b75c30c1dcbb9 Merge: f8ca81c b159ffb Author: Roger Dingledine <a...@torproject.org> Date: Thu Aug 21 22:17:23 2014 -0400
Merge branch 'maint-0.2.5' into release-0.2.5
src/or/config.c | 2 ++
1 file changed, 2 insertions(+)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
