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