commit b18bde23cf9c0afc95a83c3bfc7205218add4ddd Merge: 3d9f8ff db58d4d Author: Nick Mathewson <[email protected]> Date: Tue Dec 20 18:11:25 2016 -0500
Merge branch 'maint-0.2.5' into maint-0.2.6
changes/bug21018 | 11 +++++++++++
src/or/rendcommon.c | 6 ++++--
src/or/routerparse.c | 6 +++---
3 files changed, 18 insertions(+), 5 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
