commit 03a4e97c76b2021ec7246da03fb31d337fb50f9b Merge: 5334bcd 1525eee Author: Nick Mathewson <[email protected]> Date: Fri Feb 20 01:05:21 2015 -0500
Merge remote-tracking branch 'origin/maint-0.2.5'
changes/ticket14487 | 3 +++
src/or/config.c | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
