[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor/release-0.3.5] Merge remote-tracking branch 'tor-github/pr/1039' into maint-0.3.5
commit 224825e7ee993da72b3027558ba263dae6fcae22
Merge: e5be03949 245dccb77
Author: teor <teor@xxxxxxxxxxxxxx>
Date: Mon Aug 12 09:51:00 2019 +1000
Merge remote-tracking branch 'tor-github/pr/1039' into maint-0.3.5
changes/ticket30454 | 10 ++++++++
src/feature/hs/hs_cell.c | 16 +++++++------
src/feature/hs/hs_cell.h | 13 ----------
src/feature/hs/hs_client.c | 18 +++++++-------
src/feature/hs/hs_intropoint.c | 27 +++++++++++----------
src/feature/hs/hs_intropoint.h | 15 ------------
src/test/test_hs_cell.c | 2 +-
src/test/test_hs_intropoint.c | 4 ++--
src/trunnel/hs/cell_introduce1.c | 44 +++++++++++++---------------------
src/trunnel/hs/cell_introduce1.h | 7 ++++++
src/trunnel/hs/cell_introduce1.trunnel | 21 +++++++++++++---
11 files changed, 87 insertions(+), 90 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits