commit 054c1d5650ad0b49bcfb05040fc2f5fcce438b4a
Merge: 2980283 de65647
Author: Nick Mathewson <ni...@torproject.org>
Date: Mon Dec 19 07:59:18 2016 -0500
Merge branch 'maint-0.2.9' into release-0.2.9
changes/bug21018 | 11 +++++++++++
src/or/rendcache.c | 4 +++-
src/or/routerparse.c | 6 +++---
3 files changed, 17 insertions(+), 4 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
