tor/src/or
Nick Mathewson 63765399eb Merge remote-tracking branch 'public/ticket13037'
Conflicts:
	src/or/config.c
2015-01-18 16:07:08 -05:00
..
addressmap.c Merge branch 'bug8546_squashed' 2015-01-16 09:31:50 -05:00
addressmap.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
buffers.c Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
buffers.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
channel.c Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
channel.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
channeltls.c Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
channeltls.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
circpathbias.c Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
circpathbias.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
circuitbuild.c appease "make check-spaces" 2015-01-07 10:09:09 -05:00
circuitbuild.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
circuitlist.c Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
circuitlist.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
circuitmux_ewma.c Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
circuitmux_ewma.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
circuitmux.c Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
circuitmux.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
circuitstats.c Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
circuitstats.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
circuituse.c Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
circuituse.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
command.c Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
command.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
config_codedigest.c Resolve about 24 DOCDOCs 2012-06-05 00:17:54 -04:00
config.c Merge remote-tracking branch 'public/ticket13037' 2015-01-18 16:07:08 -05:00
config.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
confparse.c Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
confparse.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
connection_edge.c Move entry_port_cfg_t fields in entry_connection_t 2015-01-16 09:22:58 -05:00
connection_edge.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
connection_or.c Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
connection_or.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
connection.c Merge branch 'bug8546_squashed' 2015-01-16 09:31:50 -05:00
connection.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
control.c Merge remote-tracking branch 'public/ticket13037' 2015-01-18 16:07:08 -05:00
control.h GETINFO bw-event-cache to get information on recent BW events 2015-01-07 13:19:43 -05:00
cpuworker.c Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
cpuworker.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
directory.c Merge remote-tracking branch 'public/bug14261_025' 2015-01-18 15:28:35 -05:00
directory.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
dirserv.c whitespace fix 2015-01-13 13:11:39 -05:00
dirserv.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
dirvote.c Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
dirvote.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
dns.c Merge remote-tracking branch 'origin/maint-0.2.5' 2015-01-12 00:59:48 -05:00
dns.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
dnsserv.c Move entry_port_cfg_t fields in entry_connection_t 2015-01-16 09:22:58 -05:00
dnsserv.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
entrynodes.c Merge remote-tracking branch 'public/bug12485' 2015-01-18 13:49:30 -05:00
entrynodes.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
eventdns_tor.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
ext_orport.c Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
ext_orport.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
fp_pair.c Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
fp_pair.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
geoip.c Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
geoip.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
hibernate.c Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
hibernate.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
include.am make "make test-stem" run stem tests on tor 2015-01-06 09:03:44 -05:00
main.c Merge remote-tracking branch 'andrea/ticket12585_v3' 2015-01-13 12:50:55 -05:00
main.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
Makefile.nmake Implement scheduler mechanism to track lists of channels wanting cells or writes; doesn't actually drive the cell flow from it yet 2014-09-30 22:48:24 -07:00
microdesc.c Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
microdesc.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
networkstatus.c fix new mingw64 compilation warnings 2015-01-08 10:44:30 -05:00
networkstatus.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
nodelist.c Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
nodelist.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
ntmain.c Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
ntmain.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
onion_fast.c Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
onion_fast.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
onion_ntor.c Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
onion_ntor.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
onion_tap.c Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
onion_tap.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
onion.c Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
onion.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
or.h Remove the unused rend_cache_entry_t->received field. 2015-01-18 15:53:06 -05:00
policies.c Merge branch 'exitnode_10067_squashed' 2015-01-06 15:15:18 -05:00
policies.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
reasons.c Add string for IP_NOW_REDUNDANT in circuit_end_reason_to_control_string 2015-01-15 11:53:20 -05:00
reasons.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
relay.c Merge branch 'bug8546_squashed' 2015-01-16 09:31:50 -05:00
relay.h Merge remote-tracking branch 'public/feature11791' 2015-01-06 13:52:54 -05:00
rendclient.c fix typo 2015-01-15 11:03:13 -05:00
rendclient.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
rendcommon.c Remove the unused rend_cache_entry_t->received field. 2015-01-18 15:53:06 -05:00
rendcommon.h Merge branch 'bug13806_squashed' 2015-01-12 13:59:26 -05:00
rendmid.c Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
rendmid.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
rendservice.c Speed up hidden service bootstrap by reducing the initial post delay 2015-01-10 22:34:29 +11:00
rendservice.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
rephist.c Merge remote-tracking branch 'public/bug13988_025' 2015-01-07 11:45:24 -05:00
rephist.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
replaycache.c Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
replaycache.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
router.c Merge branch 'bug8546_squashed' 2015-01-16 09:31:50 -05:00
router.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
routerlist.c Merge branch 'master' of https://git.torproject.org/tor into bug13111-empty-key-files-fn-empty 2015-01-10 17:20:06 +11:00
routerlist.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
routerparse.c Merge branch 'bug9286_v3_squashed' 2015-01-07 10:06:50 -05:00
routerparse.h Merge branch 'bug9286_v3_squashed' 2015-01-07 10:06:50 -05:00
routerset.c Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
routerset.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
scheduler.c Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
scheduler.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
statefile.c Merge branch 'master' of https://git.torproject.org/tor into bug13111-empty-key-files-fn-empty 2015-01-10 17:20:06 +11:00
statefile.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
status.c Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
status.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
tor_main.c Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
transports.c Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
transports.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00