commit 72d9e057c37bde3f735961b62ed7dc42adcb48ba Merge: 9203b3e b9ef21c Author: Nick Mathewson <[email protected]> Date: Tue Feb 7 09:21:13 2017 -0500
Merge branch 'maint-0.2.5' into release-0.2.5
changes/bifroest | 3 +++
src/or/config.c | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
