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