Nick Mathewson 6b670d6032 Merge branch 'bug3263' 14 lat temu
..
Makefile.am e36f9d1d9b Link to libevent_openssl statically when requested 15 lat temu
buffers.c 31120ff692 Remove unused var in write_to_evbuffer_zlib 14 lat temu
buffers.h 21de9d46e2 Merge remote-tracking branch 'origin/maint-0.2.2' 15 lat temu
circuitbuild.c ab8c0d4c9e Merge branch 'maint-0.2.2' 14 lat temu
circuitbuild.h 47c8433a0c Make the get_options() return const 15 lat temu
circuitlist.c c780bc4d0b Merge branch 'bug3465-022' into bug3465-023 15 lat temu
circuitlist.h 8ee92f28e0 Add a circuit_purpose_to_string() function, and use it 15 lat temu
circuituse.c 42d6f34590 Merge remote-tracking branch 'origin/maint-0.2.2' 15 lat temu
circuituse.h 47c8433a0c Make the get_options() return const 15 lat temu
command.c fa1d47293b Merge remote-tracking branch 'origin/maint-0.2.2' 15 lat temu
command.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) 15 lat temu
config.c 6b670d6032 Merge branch 'bug3263' 14 lat temu
config.h 47c8433a0c Make the get_options() return const 15 lat temu
config_codedigest.c f26abf5f54 fix codestyle issues 17 lat temu
connection.c 57822cbbbe Avoid double-free in bufferevent read/write cbs 14 lat temu
connection.h e617a34d58 Add, use a bufferevent-safe connection_flush() 15 lat temu
connection_edge.c f883ec09b5 Merge remote-tracking branch 'origin/maint-0.2.2' 14 lat temu
connection_edge.h 47c8433a0c Make the get_options() return const 15 lat temu
connection_or.c 31b9b1a5bb Merge remote-tracking branch 'origin/maint-0.2.2' 15 lat temu
connection_or.h 47c8433a0c Make the get_options() return const 15 lat temu
control.c ca6efcf507 Make handle_control_setevents table-driven 15 lat temu
control.h 2527acb2dc Merge remote-tracking branch 'origin/maint-0.2.2' 15 lat temu
cpuworker.c 21de9d46e2 Merge remote-tracking branch 'origin/maint-0.2.2' 15 lat temu
cpuworker.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) 15 lat temu
directory.c 1d18c2deb6 Don't shadow parameters with local variables 14 lat temu
directory.h 4cc348e896 Code to make clients fetch and use microdescriptors for circuit building 15 lat temu
dirserv.c 734e860d98 Merge remote-tracking branch 'origin/maint-0.2.2' 14 lat temu
dirserv.h 47c8433a0c Make the get_options() return const 15 lat temu
dirvote.c 47c8433a0c Make the get_options() return const 15 lat temu
dirvote.h 47c8433a0c Make the get_options() return const 15 lat temu
dns.c 47c8433a0c Make the get_options() return const 15 lat temu
dns.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) 15 lat temu
dnsserv.c 910472c514 client-side DNS proxy server: reply NOTIMPL to unsupported queries 15 lat temu
dnsserv.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) 15 lat temu
eventdns.c 1d18c2deb6 Don't shadow parameters with local variables 14 lat temu
eventdns.h cfeafe5e77 Use a 64-bit type to hold sockets on win64. 15 lat temu
eventdns_tor.h 1a07348a50 Bump copyright statements to 2011 15 lat temu
geoip.c a0ae80788c Replace 4 more sscanf()s with tor_sscanf() 14 lat temu
geoip.h 47c8433a0c Make the get_options() return const 15 lat temu
hibernate.c 47c8433a0c Make the get_options() return const 15 lat temu
hibernate.h 47c8433a0c Make the get_options() return const 15 lat temu
main.c 19febed9e5 Merge remote-tracking branch 'rransom-tor/bug3349' 15 lat temu
main.h 47c8433a0c Make the get_options() return const 15 lat temu
microdesc.c 47c8433a0c Make the get_options() return const 15 lat temu
microdesc.h 47c8433a0c Make the get_options() return const 15 lat temu
networkstatus.c 47c8433a0c Make the get_options() return const 15 lat temu
networkstatus.h 47c8433a0c Make the get_options() return const 15 lat temu
nodelist.c 47c8433a0c Make the get_options() return const 15 lat temu
nodelist.h a1ceee193b Bump copyright statements to 2011 (master) 15 lat temu
ntmain.c 57b954293e Merge remote-tracking branch 'origin/maint-0.2.2' 15 lat temu
ntmain.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) 15 lat temu
onion.c 44ad734573 Merge remote-tracking branch 'public/3122_memcmp_squashed' into bug3122_memcmp_022 15 lat temu
onion.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) 15 lat temu
or.h 0b536469ee Merge remote-tracking branch 'rransom-tor/bug3456' 15 lat temu
policies.c 1d18c2deb6 Don't shadow parameters with local variables 14 lat temu
policies.h 47c8433a0c Make the get_options() return const 15 lat temu
reasons.c fc64783278 Send END_STREAM_REASON_NOROUTE: clients that didn't grok it are now obsolete 15 lat temu
reasons.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) 15 lat temu
relay.c 1d18c2deb6 Don't shadow parameters with local variables 14 lat temu
relay.h 47c8433a0c Make the get_options() return const 15 lat temu
rendclient.c a857f61e27 Merge remote-tracking branch 'rransom-tor/bug3332-v2' 15 lat temu
rendclient.h 47c8433a0c Make the get_options() return const 15 lat temu
rendcommon.c 734e860d98 Merge remote-tracking branch 'origin/maint-0.2.2' 14 lat temu
rendcommon.h 03ccce6d77 Merge remote-tracking branch 'origin/maint-0.2.2' 15 lat temu
rendmid.c 44ad734573 Merge remote-tracking branch 'public/3122_memcmp_squashed' into bug3122_memcmp_022 15 lat temu
rendmid.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) 15 lat temu
rendservice.c a857f61e27 Merge remote-tracking branch 'rransom-tor/bug3332-v2' 15 lat temu
rendservice.h 47c8433a0c Make the get_options() return const 15 lat temu
rephist.c 47c8433a0c Make the get_options() return const 15 lat temu
rephist.h d52a99dc77 Merge remote branch 'origin/maint-0.2.2' 15 lat temu
router.c 6b670d6032 Merge branch 'bug3263' 14 lat temu
router.h 47c8433a0c Make the get_options() return const 15 lat temu
routerlist.c eca982d3eb Defensive programming: don't crash with broken node_t 14 lat temu
routerlist.h fa1d47293b Merge remote-tracking branch 'origin/maint-0.2.2' 15 lat temu
routerparse.c 1d18c2deb6 Don't shadow parameters with local variables 14 lat temu
routerparse.h 27d1675d93 Move the decl for tor_gettimofday_cache_clear to the right header 15 lat temu
status.c 47c8433a0c Make the get_options() return const 15 lat temu
status.h ee95430d39 Implement more heartbeat message stuff. 15 lat temu
tor_main.c f1de329e78 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 15 lat temu