[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

[nickm@xxxxxxxxxxxxxx]

commit 8a1f0876ed329f6c9d73e6ca786cd8437e6bb55b
Merge: 3f5a710 f2a3041
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Feb 7 10:38:05 2017 -0500

    Merge branch 'maint-0.2.6' into maint-0.2.7-redux

 changes/bug16248 |  8 ++++++++
 changes/bug18710 |  6 ++++++
 src/or/dnsserv.c |  4 +---
 src/or/main.c    | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++----
 4 files changed, 66 insertions(+), 7 deletions(-)




_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits