[tor-commits] [tor/master] Merge branch 'bug20599_030_v4'
nickm at torproject.org
nickm at torproject.org
Fri Dec 2 12:47:56 UTC 2016
commit e317a9cb7c91fac7b3583a86361d6bd613f18ee4
Merge: 6f101f9 b917b38
Author: Nick Mathewson <nickm at torproject.org>
Date: Fri Dec 2 07:47:32 2016 -0500
Merge branch 'bug20599_030_v4'
changes/bug20559 | 4 ++
src/common/util.c | 8 +++-
src/or/rendservice.c | 115 ++++++++++++++++++++++++++++-----------------------
3 files changed, 73 insertions(+), 54 deletions(-)
More information about the tor-commits
mailing list