Nick Mathewson 5b0b51ca3f Merge remote-tracking branch 'public/bug6304_v3' into maint-0.2.4 11 lat temu
..
Makefile.nmake 60a2aa8b00 Add ntor-related modules to the Makefiles.nmake 11 lat temu
addressmap.c b998431a33 Merge branch '024_msvc_squashed' 11 lat temu
addressmap.h 4da083db3b Update the copyright date to 201. 11 lat temu
buffers.c 59fc77e29b Fix a bug that roger found in the wide_circ_id code 11 lat temu
buffers.h 4da083db3b Update the copyright date to 201. 11 lat temu
channel.c ca50fb4f81 Don't assert when writing a cell to a CLOSING connection. 11 lat temu
channel.h d6634001c9 Merge remote-tracking branch 'public/wide_circ_ids' 11 lat temu
channeltls.c b9037521c6 Fix a framing bug when reading versions from a versions cell. 11 lat temu
channeltls.h 4da083db3b Update the copyright date to 201. 11 lat temu
circuitbuild.c 597cd893c5 Merge remote-tracking branch 'public/bug6174' into maint-0.2.4 11 lat temu
circuitbuild.h 3340d3279d Downgrade an assert to LD_BUG 11 lat temu
circuitlist.c 4eaca17f2f Merge branch 'bug7582_v2' into maint-0.2.4 11 lat temu
circuitlist.h 7bb51fdd89 Rename circuit_expire_all_dirty_circs 11 lat temu
circuitmux.c 339df5df08 Fix 8447: use %u to format circid_t. 11 lat temu
circuitmux.h 4da083db3b Update the copyright date to 201. 11 lat temu
circuitmux_ewma.c 4da083db3b Update the copyright date to 201. 11 lat temu
circuitmux_ewma.h 4da083db3b Update the copyright date to 201. 11 lat temu
circuitstats.c 5b0b51ca3f Merge remote-tracking branch 'public/bug6304_v3' into maint-0.2.4 11 lat temu
circuitstats.h 4da083db3b Update the copyright date to 201. 11 lat temu
circuituse.c 4eaca17f2f Merge branch 'bug7582_v2' into maint-0.2.4 11 lat temu
circuituse.h 62fb209d83 Stop frobbing timestamp_dirty as our sole means to mark circuits unusable 11 lat temu
command.c 339df5df08 Fix 8447: use %u to format circid_t. 11 lat temu
command.h 4da083db3b Update the copyright date to 201. 11 lat temu
config.c 5b0b51ca3f Merge remote-tracking branch 'public/bug6304_v3' into maint-0.2.4 11 lat temu
config.h 178599f026 get rid of the new caching notion in resolve_my_address() 11 lat temu
config_codedigest.c 913067f788 Resolve about 24 DOCDOCs 12 lat temu
confparse.c 6f20a74d52 Merge branch 'bug8240_v2_squashed' into maint-0.2.4 11 lat temu
confparse.h 4da083db3b Update the copyright date to 201. 11 lat temu
connection.c 63b67577d6 Check return values from fcntl and setsockopt 11 lat temu
connection.h 4da083db3b Update the copyright date to 201. 11 lat temu
connection_edge.c 597cd893c5 Merge remote-tracking branch 'public/bug6174' into maint-0.2.4 11 lat temu
connection_edge.h 4da083db3b Update the copyright date to 201. 11 lat temu
connection_or.c 339df5df08 Fix 8447: use %u to format circid_t. 11 lat temu
connection_or.h d6634001c9 Merge remote-tracking branch 'public/wide_circ_ids' 11 lat temu
control.c 3f837d4826 Make stream events for RESOLVE lookups more consistent 11 lat temu
control.h 4da083db3b Update the copyright date to 201. 11 lat temu
cpuworker.c 63b67577d6 Check return values from fcntl and setsockopt 11 lat temu
cpuworker.h dfbd19df41 Merge branch 'time_based_onionqueue_v2' of ssh://git-rw.torproject.org/nickm/tor 11 lat temu
directory.c e4614d30e5 Add a DisableV2DirectoryInfo_ option to 404 all v2 ns requests 11 lat temu
directory.h 4da083db3b Update the copyright date to 201. 11 lat temu
dirserv.c aa4fcc4f13 Merge remote-tracking branch 'public/bug6164' into maint-0.2.4 11 lat temu
dirserv.h 5959d1c105 Merge remote-tracking branch 'andrea/bug8435' into maint-0.2.4 11 lat temu
dirvote.c b0b0d6af63 Merge branch 'bug2286_unit_test_squashed' 11 lat temu
dirvote.h b0b0d6af63 Merge branch 'bug2286_unit_test_squashed' 11 lat temu
dns.c a141430ec3 Rename log() to tor_log() for logging 11 lat temu
dns.h 4da083db3b Update the copyright date to 201. 11 lat temu
dnsserv.c ad8a27a393 Fix some wide lines 11 lat temu
dnsserv.h ad8a27a393 Fix some wide lines 11 lat temu
entrynodes.c 6f20a74d52 Merge branch 'bug8240_v2_squashed' into maint-0.2.4 11 lat temu
entrynodes.h 0fa362cafa Merge remote-tracking branch 'public/feature4994-rebased' 11 lat temu
eventdns_tor.h 4da083db3b Update the copyright date to 201. 11 lat temu
geoip.c ba7d93db16 Merge remote-tracking branch 'public/bug7816_023' 11 lat temu
geoip.h da1e44ee51 Remove dirreq-v2-* lines from extra-info descriptors. 11 lat temu
hibernate.c 365e302f61 Remove a bunch of unused macro definitions 11 lat temu
hibernate.h 4da083db3b Update the copyright date to 201. 11 lat temu
include.am 50f527a2c9 Actually link against nacl when we want to use it 11 lat temu
main.c 597cd893c5 Merge remote-tracking branch 'public/bug6174' into maint-0.2.4 11 lat temu
main.h 4da083db3b Update the copyright date to 201. 11 lat temu
microdesc.c 323cb655be Merge remote-tracking branch 'public/bug7164_diagnostic' into maint-0.2.4 11 lat temu
microdesc.h adfc3de833 Log fname:lineno in log messages for #7164 11 lat temu
networkstatus.c 5bfa373eee Remove some totally unused functions 11 lat temu
networkstatus.h 5bfa373eee Remove some totally unused functions 11 lat temu
nodelist.c 2b22c0aeef On END_REASON_EXITPOLICY, mark circuit as unusable for that address. 11 lat temu
nodelist.h 2b22c0aeef On END_REASON_EXITPOLICY, mark circuit as unusable for that address. 11 lat temu
ntmain.c 4da083db3b Update the copyright date to 201. 11 lat temu
ntmain.h 4da083db3b Update the copyright date to 201. 11 lat temu
onion.c 7cde094fd5 Fix a warning when building with --disable-curve25519 11 lat temu
onion.h 1af89ce540 Fix an MSVC warning in onion.h prototypes 11 lat temu
onion_fast.c 4da083db3b Update the copyright date to 201. 11 lat temu
onion_fast.h d86a45f991 Wrap more macro definitions in (parentheses) 11 lat temu
onion_ntor.c 4da083db3b Update the copyright date to 201. 11 lat temu
onion_ntor.h 4da083db3b Update the copyright date to 201. 11 lat temu
onion_tap.c 4da083db3b Update the copyright date to 201. 11 lat temu
onion_tap.h 4da083db3b Update the copyright date to 201. 11 lat temu
or.h 6f20a74d52 Merge branch 'bug8240_v2_squashed' into maint-0.2.4 11 lat temu
policies.c 2b22c0aeef On END_REASON_EXITPOLICY, mark circuit as unusable for that address. 11 lat temu
policies.h 2b22c0aeef On END_REASON_EXITPOLICY, mark circuit as unusable for that address. 11 lat temu
reasons.c d1b5ae903f When we get an END cell before CONNECTED, don't report SOCKS success 11 lat temu
reasons.h 4da083db3b Update the copyright date to 201. 11 lat temu
relay.c 4eaca17f2f Merge branch 'bug7582_v2' into maint-0.2.4 11 lat temu
relay.h d6634001c9 Merge remote-tracking branch 'public/wide_circ_ids' 11 lat temu
rendclient.c 339df5df08 Fix 8447: use %u to format circid_t. 11 lat temu
rendclient.h 4da083db3b Update the copyright date to 201. 11 lat temu
rendcommon.c 5bfa373eee Remove some totally unused functions 11 lat temu
rendcommon.h 5bfa373eee Remove some totally unused functions 11 lat temu
rendmid.c 339df5df08 Fix 8447: use %u to format circid_t. 11 lat temu
rendmid.h 4da083db3b Update the copyright date to 201. 11 lat temu
rendservice.c 339df5df08 Fix 8447: use %u to format circid_t. 11 lat temu
rendservice.h 4da083db3b Update the copyright date to 201. 11 lat temu
rephist.c 5d400b5f7f Authorities were adding downtime for every relay every restart 11 lat temu
rephist.h 4eff8b6530 When we mark a node as a sybil, mark it down and reset its uptime to 0 11 lat temu
replaycache.c 4da083db3b Update the copyright date to 201. 11 lat temu
replaycache.h 4da083db3b Update the copyright date to 201. 11 lat temu
router.c 0cf327dc78 Merge remote-tracking branch 'public/unused_stuff' into maint-0.2.4 11 lat temu
router.h 5bfa373eee Remove some totally unused functions 11 lat temu
routerlist.c 26639b7798 Merge remote-tracking branch 'public/no_dup_guards' into maint-0.2.4 11 lat temu
routerlist.h 5bfa373eee Remove some totally unused functions 11 lat temu
routerparse.c eb9420082d Check for 0.2.4.8, not 0.2.4.7, to determine EXTEND2 support 11 lat temu
routerparse.h 6170bc5a93 Refactor storing of measured_bw versus Unmeasured=1. 11 lat temu
routerset.c 8b4195f021 Fix typos in a few log messages 11 lat temu
routerset.h ff9bdbd56f When excluding nodes by country, exclude {??} and {A1} too 11 lat temu
statefile.c fed7f01377 Add EntryGuardPathUseBias to state file keyword list. 11 lat temu
statefile.h 4da083db3b Update the copyright date to 201. 11 lat temu
status.c a141430ec3 Rename log() to tor_log() for logging 11 lat temu
status.h 4da083db3b Update the copyright date to 201. 11 lat temu
tor_main.c 6879910334 Fix a comment in tor_main.c 11 lat temu
transports.c 0cf327dc78 Merge remote-tracking branch 'public/unused_stuff' into maint-0.2.4 11 lat temu
transports.h 4da083db3b Update the copyright date to 201. 11 lat temu