[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor/maint-0.3.4] Merge branch 'maint-0.3.3' of https://git.torproject.org/tor into maint-0.3.3
commit 0431bb61cae4b8bcb348283a1fdde6d1847ce26d
Merge: bc8636e89 75b95e1c8
Author: David Goulet <dgoulet@xxxxxxxxxxxxxx>
Date: Thu Sep 20 16:31:18 2018 -0400
Merge branch 'maint-0.3.3' of https://git.torproject.org/tor into maint-0.3.3
.travis.yml | 277 +-
Makefile.am | 3 +-
changes/27286 | 4 +
changes/bug20424_029_minimal | 4 +
changes/bug25440 | 5 +
changes/bug25505 | 3 +
changes/bug25512 | 5 +
changes/bug25705 | 5 +
changes/bug26269 | 5 +
changes/bug26485 | 4 +
changes/bug26497 | 3 +
changes/bug26497-backport | 3 +
changes/bug26497-cd | 4 +
changes/bug26627 | 7 +
changes/bug26779 | 4 +
changes/bug26785 | 4 +
changes/bug26787 | 3 +
changes/bug26830 | 3 +
changes/bug26853 | 3 +
changes/bug26873 | 4 +
changes/bug26876 | 4 +
changes/bug26924 | 4 +
changes/bug26927 | 4 +
changes/bug26932 | 3 +
changes/bug26948 | 4 +
changes/bug27081 | 4 +
changes/bug27088 | 5 +
changes/bug27090 | 3 +
changes/bug27093 | 3 +
changes/bug27164 | 4 +
changes/bug27177 | 4 +
changes/bug27185 | 3 +
changes/bug27206 | 4 +
changes/bug27226 | 5 +
changes/bug27295 | 3 +
changes/bug27335 | 4 +
changes/bug27344 | 4 +
changes/bug27345 | 5 +
changes/bug27418 | 3 +
changes/bug27453 | 3 +
changes/bug27461 | 5 +
changes/bug27463 | 3 +
changes/bug27465 | 5 +
changes/bug27649 | 4 +
changes/bug27658 | 6 +
changes/bug27687 | 4 +
changes/bug27708 | 4 +
changes/geoip-2018-07-03 | 4 +
changes/geoip-2018-08-07 | 4 +
changes/geoip-2018-09-06 | 4 +
changes/task26771 | 4 +
changes/ticket24629 | 3 +
changes/ticket24629-backport | 3 +
changes/ticket26560 | 3 +
changes/ticket26647 | 4 +
changes/ticket26952-cargo | 3 +
changes/ticket26952-ccache | 3 +
changes/ticket27087 | 3 +
changes/ticket27252 | 6 +
changes/ticket27252-032 | 5 +
configure.ac | 68 +-
contrib/win32build/tor-mingw.nsi.in | 2 +-
doc/HACKING/GettingStartedRust.md | 8 +-
src/common/address.c | 5 +-
src/common/compat_threads.c | 5 +-
src/common/compat_threads.h | 19 +-
src/common/compress_zstd.c | 4 +
src/common/sandbox.c | 2 +-
src/common/tortls.c | 17 +-
src/config/geoip | 59634 +++++++++++-----------------------
src/config/geoip6 | 9942 +++---
src/ext/tinytest.c | 12 +-
src/or/auth_dirs.inc | 4 +-
src/or/channelpadding.c | 9 +-
src/or/circuituse.c | 45 +-
src/or/config.c | 10 +-
src/or/connection_edge.c | 1 -
src/or/connection_or.c | 14 +-
src/or/control.c | 13 +-
src/or/dirserv.c | 51 +-
src/or/dirserv.h | 3 +-
src/or/dirvote.c | 9 +-
src/or/hs_circuit.c | 20 +-
src/or/hs_service.c | 36 +-
src/or/hs_service.h | 5 +-
src/or/main.c | 17 +-
src/or/rendclient.c | 9 +
src/or/router.c | 15 +-
src/rust/protover/errors.rs | 3 +
src/rust/protover/protoset.rs | 95 +-
src/rust/protover/protover.rs | 42 +-
src/rust/protover/tests/protover.rs | 14 +-
src/rust/tor_rust/include.am | 2 -
src/test/include.am | 2 +-
src/test/test.c | 10 +-
src/test/test_bt.sh | 2 +
src/test/test_config.c | 31 +-
src/test/test_dir.c | 53 +-
src/test/test_entrynodes.c | 6 +
src/test/test_hs_cell.c | 4 +-
src/test/test_hs_intropoint.c | 4 +-
src/test/test_hs_service.c | 2 +-
src/test/test_key_expiration.sh | 8 +
src/test/test_keygen.sh | 8 +
src/test/test_protover.c | 22 +-
src/test/test_rust.sh | 6 +-
src/test/test_tortls.c | 122 +-
src/win32/orconfig.h | 2 +-
108 files changed, 26650 insertions(+), 44276 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits