commit 4dc5475e3d7d0877905fb87d48fab5003d9d5568
Merge: 0b571cf b18bde2
Author: Nick Mathewson <ni...@torproject.org>
Date: Tue Dec 20 18:11:39 2016 -0500
Merge branch 'maint-0.2.6' into release-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
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
