Nick Mathewson 824160fd82 Fix a type, and hopefully the win64 builds. 7 lat temu
..
app 0db5c54957 Merge branch 'nss_squashed' into nss_merge 7 lat temu
config ce4f73f8a3 Update sample torrc files to warn about not using BridgeRelay and MyFamily together 7 lat temu
core 0db5c54957 Merge branch 'nss_squashed' into nss_merge 7 lat temu
ext 36f3bdac03 Update prefork and postfork NSS code for unit tests. 7 lat temu
feature 0db5c54957 Merge branch 'nss_squashed' into nss_merge 7 lat temu
lib 824160fd82 Fix a type, and hopefully the win64 builds. 7 lat temu
rust 0db5c54957 Merge branch 'nss_squashed' into nss_merge 7 lat temu
test 3b61bdb5ae Try to fix new coverity warnings in unit tests. 7 lat temu
tools 0db5c54957 Merge branch 'nss_squashed' into nss_merge 7 lat temu
trunnel 7556933537 Merge branch 'socks_trunnel4_squashed' into socks_trunnel4_squashed_merged 7 lat temu
win32 e22822e4ae Bump master to 0.3.5.0-alpha-dev 8 lat temu
include.am 81cb0afb2b Start splitting src/or 7 lat temu