Nick Mathewson 73182e3220 Merge remote-tracking branch 'public/bug8207' 13 lat temu
..
Makefile.nmake 60a2aa8b00 Add ntor-related modules to the Makefiles.nmake 13 lat temu
addressmap.c b998431a33 Merge branch '024_msvc_squashed' 13 lat temu
addressmap.h 4da083db3b Update the copyright date to 201. 13 lat temu
buffers.c d6634001c9 Merge remote-tracking branch 'public/wide_circ_ids' 13 lat temu
buffers.h 4da083db3b Update the copyright date to 201. 13 lat temu
channel.c d6634001c9 Merge remote-tracking branch 'public/wide_circ_ids' 13 lat temu
channel.h d6634001c9 Merge remote-tracking branch 'public/wide_circ_ids' 13 lat temu
channeltls.c d6634001c9 Merge remote-tracking branch 'public/wide_circ_ids' 13 lat temu
channeltls.h 4da083db3b Update the copyright date to 201. 13 lat temu
circuitbuild.c d6634001c9 Merge remote-tracking branch 'public/wide_circ_ids' 13 lat temu
circuitbuild.h bce6714f99 Refactor code that rolls back the use state 13 lat temu
circuitlist.c d6634001c9 Merge remote-tracking branch 'public/wide_circ_ids' 13 lat temu
circuitlist.h 4da083db3b Update the copyright date to 201. 13 lat temu
circuitmux.c 4da083db3b Update the copyright date to 201. 13 lat temu
circuitmux.h 4da083db3b Update the copyright date to 201. 13 lat temu
circuitmux_ewma.c 4da083db3b Update the copyright date to 201. 13 lat temu
circuitmux_ewma.h 4da083db3b Update the copyright date to 201. 13 lat temu
circuitstats.c da5817772d Rename and relocate the bw weight scale param getter. 13 lat temu
circuitstats.h 4da083db3b Update the copyright date to 201. 13 lat temu
circuituse.c 3433216268 Merge remote-tracking branch 'public/easy_ratelim' 13 lat temu
circuituse.h 4da083db3b Update the copyright date to 201. 13 lat temu
command.c d6634001c9 Merge remote-tracking branch 'public/wide_circ_ids' 13 lat temu
command.h 4da083db3b Update the copyright date to 201. 13 lat temu
config.c 5fcc5dfa77 make check-spaces 13 lat temu
config.h 178599f026 get rid of the new caching notion in resolve_my_address() 13 lat temu
config_codedigest.c 913067f788 Resolve about 24 DOCDOCs 14 lat temu
confparse.c 4da083db3b Update the copyright date to 201. 13 lat temu
confparse.h 4da083db3b Update the copyright date to 201. 13 lat temu
connection.c d6634001c9 Merge remote-tracking branch 'public/wide_circ_ids' 13 lat temu
connection.h 4da083db3b Update the copyright date to 201. 13 lat temu
connection_edge.c bce6714f99 Refactor code that rolls back the use state 13 lat temu
connection_edge.h 4da083db3b Update the copyright date to 201. 13 lat temu
connection_or.c d6634001c9 Merge remote-tracking branch 'public/wide_circ_ids' 13 lat temu
connection_or.h d6634001c9 Merge remote-tracking branch 'public/wide_circ_ids' 13 lat temu
control.c ba7d93db16 Merge remote-tracking branch 'public/bug7816_023' 13 lat temu
control.h 4da083db3b Update the copyright date to 201. 13 lat temu
cpuworker.c d6634001c9 Merge remote-tracking branch 'public/wide_circ_ids' 13 lat temu
cpuworker.h dfbd19df41 Merge branch 'time_based_onionqueue_v2' of ssh://git-rw.torproject.org/nickm/tor 13 lat temu
directory.c d7089ff228 Restore the entry/dirguard distinction. 13 lat temu
directory.h 4da083db3b Update the copyright date to 201. 13 lat temu
dirserv.c 01184f164f Merge remote-tracking branch 'public/bug8158' 13 lat temu
dirserv.h cd4ad45ba3 Include a flag-thresholds line in each vote to describe flag cutoffs 13 lat temu
dirvote.c 99457ee776 Fix two more coverity-spotted leaks in master. 13 lat temu
dirvote.h 194bd56c8a Refactor generating the m lines in a vote into its own function 13 lat temu
dns.c a141430ec3 Rename log() to tor_log() for logging 13 lat temu
dns.h 4da083db3b Update the copyright date to 201. 13 lat temu
dnsserv.c 4da083db3b Update the copyright date to 201. 13 lat temu
dnsserv.h 4da083db3b Update the copyright date to 201. 13 lat temu
entrynodes.c d7089ff228 Restore the entry/dirguard distinction. 13 lat temu
entrynodes.h 0fa362cafa Merge remote-tracking branch 'public/feature4994-rebased' 13 lat temu
eventdns_tor.h 4da083db3b Update the copyright date to 201. 13 lat temu
geoip.c ba7d93db16 Merge remote-tracking branch 'public/bug7816_023' 13 lat temu
geoip.h da1e44ee51 Remove dirreq-v2-* lines from extra-info descriptors. 13 lat temu
hibernate.c 4da083db3b Update the copyright date to 201. 13 lat temu
hibernate.h 4da083db3b Update the copyright date to 201. 13 lat temu
include.am 50f527a2c9 Actually link against nacl when we want to use it 13 lat temu
main.c b166e9edb9 simplify timing checks 13 lat temu
main.h 4da083db3b Update the copyright date to 201. 13 lat temu
microdesc.c a8297cdbd3 use microdescriptors if *any* of our bridges can handle them 13 lat temu
microdesc.h 4da083db3b Update the copyright date to 201. 13 lat temu
networkstatus.c da5817772d Rename and relocate the bw weight scale param getter. 13 lat temu
networkstatus.h da5817772d Rename and relocate the bw weight scale param getter. 13 lat temu
nodelist.c 2e9cd4b724 Quick fix on 5956 for authorities 13 lat temu
nodelist.h 4da083db3b Update the copyright date to 201. 13 lat temu
ntmain.c 4da083db3b Update the copyright date to 201. 13 lat temu
ntmain.h 4da083db3b Update the copyright date to 201. 13 lat temu
onion.c 7cde094fd5 Fix a warning when building with --disable-curve25519 13 lat temu
onion.h 1af89ce540 Fix an MSVC warning in onion.h prototypes 13 lat temu
onion_fast.c 4da083db3b Update the copyright date to 201. 13 lat temu
onion_fast.h d86a45f991 Wrap more macro definitions in (parentheses) 13 lat temu
onion_ntor.c 4da083db3b Update the copyright date to 201. 13 lat temu
onion_ntor.h 4da083db3b Update the copyright date to 201. 13 lat temu
onion_tap.c 4da083db3b Update the copyright date to 201. 13 lat temu
onion_tap.h 4da083db3b Update the copyright date to 201. 13 lat temu
or.h d6634001c9 Merge remote-tracking branch 'public/wide_circ_ids' 13 lat temu
policies.c a141430ec3 Rename log() to tor_log() for logging 13 lat temu
policies.h 4da083db3b Update the copyright date to 201. 13 lat temu
reasons.c d1b5ae903f When we get an END cell before CONNECTED, don't report SOCKS success 13 lat temu
reasons.h 4da083db3b Update the copyright date to 201. 13 lat temu
relay.c d6634001c9 Merge remote-tracking branch 'public/wide_circ_ids' 13 lat temu
relay.h d6634001c9 Merge remote-tracking branch 'public/wide_circ_ids' 13 lat temu
rendclient.c e13e30221e Implement Path use bias accounting. 13 lat temu
rendclient.h 4da083db3b Update the copyright date to 201. 13 lat temu
rendcommon.c e0581a4b57 Replace base-{16,32,64} with base{16,32,64} in the code 13 lat temu
rendcommon.h 4da083db3b Update the copyright date to 201. 13 lat temu
rendmid.c 4da083db3b Update the copyright date to 201. 13 lat temu
rendmid.h 4da083db3b Update the copyright date to 201. 13 lat temu
rendservice.c f12fafac5a Make hidden service authorization work again. 13 lat temu
rendservice.h 4da083db3b Update the copyright date to 201. 13 lat temu
rephist.c 5d400b5f7f Authorities were adding downtime for every relay every restart 13 lat temu
rephist.h 4eff8b6530 When we mark a node as a sybil, mark it down and reset its uptime to 0 13 lat temu
replaycache.c 4da083db3b Update the copyright date to 201. 13 lat temu
replaycache.h 4da083db3b Update the copyright date to 201. 13 lat temu
router.c d6634001c9 Merge remote-tracking branch 'public/wide_circ_ids' 13 lat temu
router.h 4da083db3b Update the copyright date to 201. 13 lat temu
routerlist.c 178599f026 get rid of the new caching notion in resolve_my_address() 13 lat temu
routerlist.h fcf906ec73 Add a function to compute fraction of nodes (by weighted bw) with descriptors 13 lat temu
routerparse.c da5817772d Rename and relocate the bw weight scale param getter. 13 lat temu
routerparse.h 4da083db3b Update the copyright date to 201. 13 lat temu
routerset.c b9432becbe Fix a copy-and-paste issue found by coverity 13 lat temu
routerset.h ff9bdbd56f When excluding nodes by country, exclude {??} and {A1} too 13 lat temu
statefile.c fed7f01377 Add EntryGuardPathUseBias to state file keyword list. 13 lat temu
statefile.h 4da083db3b Update the copyright date to 201. 13 lat temu
status.c a141430ec3 Rename log() to tor_log() for logging 13 lat temu
status.h 4da083db3b Update the copyright date to 201. 13 lat temu
tor_main.c 4da083db3b Update the copyright date to 201. 13 lat temu
transports.c 49e619c1cf Rename *_isin to *_contains 13 lat temu
transports.h 4da083db3b Update the copyright date to 201. 13 lat temu