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

nickm at torproject.org nickm at torproject.org
Mon Nov 7 21:14:53 UTC 2016


commit 5639f3a61e228ddc61586eb53de31400735c223d
Merge: 6c4aee1 c2fc094
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 7 16:12:22 2016 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug20484          |  5 ++++
 changes/bug20529          |  4 +++
 doc/tor.1.txt             |  4 +++
 src/common/util.c         | 12 ++++----
 src/or/rendservice.c      | 75 ++++++++++++++++++++++++++++++++---------------
 src/test/test.h           |  1 +
 src/test/test_hs.c        | 55 +++++++++++++++++++---------------
 src/test/testing_common.c | 34 ++++++++++++++++++---
 8 files changed, 135 insertions(+), 55 deletions(-)



More information about the tor-commits mailing list