Nick Mathewson ee871e7a0e 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 71d786b2d3 Merge branch 'bug2320' 13 rokov pred
buffers.h 8730884ebe Merge remote branch 'origin/maint-0.2.2' 13 rokov pred
circuitbuild.c 57b954293e Merge remote-tracking branch 'origin/maint-0.2.2' 13 rokov pred
circuitbuild.h 4ff97e3775 Merge branch 'maint-0.2.2' 13 rokov pred
circuitlist.c ee871e7a0e Merge remote-tracking branch 'origin/maint-0.2.2' 13 rokov pred
circuitlist.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) 13 rokov pred
circuituse.c ee871e7a0e Merge remote-tracking branch 'origin/maint-0.2.2' 13 rokov pred
circuituse.h ee871e7a0e Merge remote-tracking branch 'origin/maint-0.2.2' 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 1db6eb6cb7 Merge remote-tracking branch 'origin/maint-0.2.2' 13 rokov pred
config.h 8730884ebe Merge remote branch 'origin/maint-0.2.2' 13 rokov pred
config_codedigest.c f26abf5f54 fix codestyle issues 15 rokov pred
connection.c 415caba967 Merge remote branch 'arma/optimistic_server' 13 rokov pred
connection.h 8730884ebe Merge remote branch 'origin/maint-0.2.2' 13 rokov pred
connection_edge.c 737228ed8e Merge remote branch 'origin/maint-0.2.2' 13 rokov pred
connection_edge.h 737228ed8e Merge remote branch 'origin/maint-0.2.2' 13 rokov pred
connection_or.c 57b954293e 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 2be65619f9 Fix wide lines in control.c 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 84f27eb051 Merge remote branch 'origin/maint-0.2.2' 13 rokov pred
directory.h 8730884ebe Merge remote branch 'origin/maint-0.2.2' 13 rokov pred
dirserv.c f1c365b032 Merge remote 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 468da1c28a Merge remote 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 9d133464c8 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 13 rokov pred
dnsserv.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) 13 rokov pred
eventdns.c 394a6bf4cd Merge remote branch 'origin/maint-0.2.2' 13 rokov pred
eventdns.h aea9cf1011 Fix compile warnings on Snow Leopard 15 rokov pred
eventdns_tor.h 1a07348a50 Bump copyright statements to 2011 13 rokov pred
geoip.c 8b393afa94 Merge remote branch 'origin/maint-0.2.2' 13 rokov pred
geoip.h 8730884ebe Merge remote branch 'origin/maint-0.2.2' 13 rokov pred
hibernate.c 5ce8182bdb Log more about soft-hibernation 13 rokov pred
hibernate.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) 13 rokov pred
main.c ee871e7a0e Merge remote-tracking branch 'origin/maint-0.2.2' 13 rokov pred
main.h 57b954293e Merge remote-tracking branch 'origin/maint-0.2.2' 13 rokov pred
microdesc.c 0a6beb9368 Fix memory leak in md-download logic 13 rokov pred
microdesc.h 8730884ebe Merge remote branch 'origin/maint-0.2.2' 13 rokov pred
networkstatus.c 4ff97e3775 Merge branch '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 57b954293e Merge remote-tracking branch 'origin/maint-0.2.2' 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 411ec3c0f8 Add client code to detect attempts to connect to 127.0.0.1 etc 13 rokov pred
reasons.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) 13 rokov pred
relay.c 1db6eb6cb7 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 c42bd529de Merge remote branch 'origin/maint-0.2.2' 13 rokov pred
rendclient.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) 13 rokov pred
rendcommon.c d3836b02cc change APIs slightly to make #1944 easier 13 rokov pred
rendcommon.h d3836b02cc change APIs slightly to make #1944 easier 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 aaa5737a2e Merge remote branch 'origin/maint-0.2.2' 13 rokov pred
rendservice.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) 13 rokov pred
rephist.c 1db6eb6cb7 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 ebf6786ab3 Merge remote 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 e91a8c5589 Merge remote branch 'origin/maint-0.2.2' 13 rokov pred
routerlist.h 8730884ebe Merge remote branch 'origin/maint-0.2.2' 13 rokov pred
routerparse.c 84f27eb051 Merge remote 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 303c04109b Fix a couple of compile warnings on OS X 10.6 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