Nick Mathewson 865d53be54 Merge remote-tracking branch 'origin/maint-0.2.2' 13 éve
..
Makefile.am ee95430d39 Implement more heartbeat message stuff. 13 éve
buffers.c 67d88a7d60 Merge remote-tracking branch 'origin/maint-0.2.2' 13 éve
buffers.h 8730884ebe Merge remote branch 'origin/maint-0.2.2' 13 éve
circuitbuild.c 47a2e5a9ce Don't choose exit nodes without desc available 13 éve
circuitbuild.h 4ff97e3775 Merge branch 'maint-0.2.2' 13 éve
circuitlist.c 8b686d98c4 Merge maint-0.2.2 for the bug1090-part1-squashed branch 13 éve
circuitlist.h 8ee92f28e0 Add a circuit_purpose_to_string() function, and use it 13 éve
circuituse.c 32918e954f Merge remote-tracking branch 'origin/maint-0.2.2' 13 éve
circuituse.h 8b686d98c4 Merge maint-0.2.2 for the bug1090-part1-squashed branch 13 éve
command.c 42c1a47123 Revert bug1074_launch_authconn* branch: needs more design, less crashing 13 éve
command.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) 13 éve
config.c c48d6da24c Merge remote-tracking branch 'origin/maint-0.2.2' 13 éve
config.h b0a7e0d6ca Merge remote-tracking branch 'origin/maint-0.2.2' 13 éve
config_codedigest.c f26abf5f54 fix codestyle issues 15 éve
connection.c 67d88a7d60 Merge remote-tracking branch 'origin/maint-0.2.2' 13 éve
connection.h 8730884ebe Merge remote branch 'origin/maint-0.2.2' 13 éve
connection_edge.c 26c022ecbc Merge remote-tracking branch 'origin/maint-0.2.2' 13 éve
connection_edge.h 8b686d98c4 Merge maint-0.2.2 for the bug1090-part1-squashed branch 13 éve
connection_or.c 67d88a7d60 Merge remote-tracking branch 'origin/maint-0.2.2' 13 éve
connection_or.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) 13 éve
control.c 3256627a45 Merge remote-tracking branch 'origin/maint-0.2.2' 13 éve
control.h 8730884ebe Merge remote branch 'origin/maint-0.2.2' 13 éve
cpuworker.c 394a6bf4cd Merge remote branch 'origin/maint-0.2.2' 13 éve
cpuworker.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) 13 éve
directory.c 8b686d98c4 Merge maint-0.2.2 for the bug1090-part1-squashed branch 13 éve
directory.h 8730884ebe Merge remote branch 'origin/maint-0.2.2' 13 éve
dirserv.c 9d67d16c6a Merge remote-tracking branch 'origin/maint-0.2.2' 13 éve
dirserv.h f1c365b032 Merge remote branch 'origin/maint-0.2.2' 13 éve
dirvote.c d52a99dc77 Merge remote branch 'origin/maint-0.2.2' 13 éve
dirvote.h 4ff97e3775 Merge branch 'maint-0.2.2' 13 éve
dns.c 67d88a7d60 Merge remote-tracking branch 'origin/maint-0.2.2' 13 éve
dns.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) 13 éve
dnsserv.c b75d1daf40 Merge remote-tracking branch 'public/bug2332' into maint-0.2.2 13 éve
dnsserv.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) 13 éve
eventdns.c 33f058a5ba Merge remote-tracking branch 'origin/maint-0.2.2' 13 éve
eventdns.h 6a829a3404 Make eventdns server functions const void* to match libevent 13 éve
eventdns_tor.h 1a07348a50 Bump copyright statements to 2011 13 éve
geoip.c 67d88a7d60 Merge remote-tracking branch 'origin/maint-0.2.2' 13 éve
geoip.h 07ab483e62 Merge remote-tracking branch 'origin/maint-0.2.2' 13 éve
hibernate.c 525d2700dd Correctly check elapsed time in last hibernation period 13 éve
hibernate.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) 13 éve
main.c f38ecd5ac0 Merge remote-tracking branch 'origin/maint-0.2.2' 13 éve
main.h 3256627a45 Merge remote-tracking branch 'origin/maint-0.2.2' 13 éve
microdesc.c 865d53be54 Merge remote-tracking branch 'origin/maint-0.2.2' 13 éve
microdesc.h 865d53be54 Merge remote-tracking branch 'origin/maint-0.2.2' 13 éve
networkstatus.c 67d88a7d60 Merge remote-tracking branch 'origin/maint-0.2.2' 13 éve
networkstatus.h 4ff97e3775 Merge branch 'maint-0.2.2' 13 éve
nodelist.c a1ceee193b Bump copyright statements to 2011 (master) 13 éve
nodelist.h a1ceee193b Bump copyright statements to 2011 (master) 13 éve
ntmain.c 57b954293e Merge remote-tracking branch 'origin/maint-0.2.2' 13 éve
ntmain.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) 13 éve
onion.c 76582442a8 Handle failing cases of DH allocation 13 éve
onion.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) 13 éve
or.h 8b686d98c4 Merge maint-0.2.2 for the bug1090-part1-squashed branch 13 éve
policies.c 07b8b439c4 Merge remote branch 'origin/maint-0.2.2' 13 éve
policies.h b7f201f746 Merge remote branch 'origin/maint-0.2.2' 13 éve
reasons.c fc64783278 Send END_STREAM_REASON_NOROUTE: clients that didn't grok it are now obsolete 13 éve
reasons.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) 13 éve
relay.c 67d88a7d60 Merge remote-tracking branch 'origin/maint-0.2.2' 13 éve
relay.h 27d1675d93 Move the decl for tor_gettimofday_cache_clear to the right header 13 éve
rendclient.c f38ecd5ac0 Merge remote-tracking branch 'origin/maint-0.2.2' 13 éve
rendclient.h 4b13ebd5ab Merge branch 'bug3k_021' into bug3k_022 13 éve
rendcommon.c 32918e954f Merge remote-tracking branch 'origin/maint-0.2.2' 13 éve
rendcommon.h 32918e954f Merge remote-tracking branch 'origin/maint-0.2.2' 13 éve
rendmid.c 66039d9843 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 13 éve
rendmid.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) 13 éve
rendservice.c 8b686d98c4 Merge maint-0.2.2 for the bug1090-part1-squashed branch 13 éve
rendservice.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) 13 éve
rephist.c 88638d40ca Merge remote-tracking branch 'origin/maint-0.2.2' 13 éve
rephist.h d52a99dc77 Merge remote branch 'origin/maint-0.2.2' 13 éve
router.c f38ecd5ac0 Merge remote-tracking branch 'origin/maint-0.2.2' 13 éve
router.h 8730884ebe Merge remote branch 'origin/maint-0.2.2' 13 éve
routerlist.c 9d67d16c6a Merge remote-tracking branch 'origin/maint-0.2.2' 13 éve
routerlist.h 8b686d98c4 Merge maint-0.2.2 for the bug1090-part1-squashed branch 13 éve
routerparse.c 78c610eea9 Merge remote-tracking branch 'origin/maint-0.2.2' 13 éve
routerparse.h 27d1675d93 Move the decl for tor_gettimofday_cache_clear to the right header 13 éve
status.c c2d9d80a07 Reuse get_bytes_{read,written}() in status.c 13 éve
status.h ee95430d39 Implement more heartbeat message stuff. 13 éve
tor_main.c f1de329e78 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 13 éve