[tor-commits] [tor/master] Merge branch 'maint-0.3.2'
nickm at torproject.org
nickm at torproject.org
Wed Jan 31 14:20:02 UTC 2018
commit c0447033f5e1032be379b9b78d9085f71fd51bd6
Merge: d2ae1bfcb ee5c624be
Author: Nick Mathewson <nickm at torproject.org>
Date: Wed Jan 31 09:19:55 2018 -0500
Merge branch 'maint-0.3.2'
changes/bug24972 | 4 ++++
src/or/hs_client.c | 6 ++++--
src/or/hs_descriptor.c | 9 ++++++---
src/or/routerkeys.c | 11 ++++++++---
src/or/torcert.c | 21 ++++++++++++++++++++-
src/or/torcert.h | 1 +
6 files changed, 43 insertions(+), 9 deletions(-)
More information about the tor-commits
mailing list