tor/src/or
teor (Tim Wilson-Brown) c4cb4706c9 Merge branch 'feature17840-v11-squashed' into feature17840-v11-merged
Conflicts:
	src/or/directory.c
	src/test/test_routerlist.c

Fix minor conflicts.
2016-01-29 07:37:06 +11:00
..
addressmap.c Merge branch 'bug7555_v2_squashed' 2015-01-19 11:43:41 -05:00
addressmap.h Allow MapAddress and Automap to work together 2015-01-13 12:41:15 -05:00
buffers.c Add another safe_str_client to fix bug 17419 2016-01-12 10:42:01 -05:00
buffers.h Remove the unused "nulterminate" option to buf_pullup() 2015-09-01 14:36:25 -04:00
channel.c Replace usage of INLINE with inline 2015-12-15 11:34:00 -05:00
channel.h Replace usage of INLINE with inline 2015-12-15 11:34:00 -05:00
channeltls.c Refactor clock skew warning code to avoid duplication 2015-12-10 19:54:11 -05:00
channeltls.h Tests for AUTHENTICATE cell functionality. 2015-05-28 10:41:50 -04: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 Return NULL from extend_info_from_node if the node has no allowed address 2016-01-29 07:16:32 +11:00
circuitbuild.h fix a compilation warning 2015-02-11 15:10:35 -05:00
circuitlist.c Replace usage of INLINE with inline 2015-12-15 11:34:00 -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 Replace usage of INLINE with inline 2015-12-15 11:34:00 -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 Replace usage of INLINE with inline 2015-12-15 11:34:00 -05:00
circuitmux.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
circuitstats.c Implement EVENT_NETWORK_LIVENESS 2015-05-17 13:42:57 +00:00
circuitstats.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
circuituse.c Merge branch 'feature17840-v11-squashed' into feature17840-v11-merged 2016-01-29 07:37:06 +11:00
circuituse.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
command.c Remove redundant tor_free() in command_process_create_cell(). 2015-08-17 09:26:07 -04:00
command.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
config.c Merge branch 'feature17840-v11-squashed' into feature17840-v11-merged 2016-01-29 07:37:06 +11:00
config.h Fix redundant-declaration warning 2016-01-22 09:53:42 -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 Another try at fixing 17752 2015-12-17 12:30:13 -05:00
connection_edge.h More emergency-check code for un-removed pending entry conns 2015-12-16 19:16:07 -05:00
connection_or.c Correct grammatical errors in tor comments 2016-01-26 13:46:54 +11:00
connection_or.h Start testing cell encoders/processers for the v3 handshake. 2015-05-28 10:41:50 -04:00
connection.c Merge branch 'feature17840-v11-squashed' into feature17840-v11-merged 2016-01-29 07:37:06 +11:00
connection.h Choose directory servers by IPv4/IPv6 preferences 2016-01-29 07:13:57 +11:00
control.c Return NULL from extend_info_from_node if the node has no allowed address 2016-01-29 07:16:32 +11:00
control.h Add replica number to HS_DESC CREATED event 2015-09-08 12:34:05 +02:00
cpuworker.c Ensure worker threads actually exit when it is time 2015-08-21 10:36:53 -04:00
cpuworker.h Refactor cpuworker to use workqueue/threadpool code. 2015-01-14 11:23:34 -05:00
dircollate.c Fix typo in double_digest_map type 2015-08-18 08:18:44 -04:00
dircollate.h Appease make check-spaces 2015-06-01 12:59:14 +00:00
directory.c Merge branch 'feature17840-v11-squashed' into feature17840-v11-merged 2016-01-29 07:37:06 +11:00
directory.h Merge branch 'feature17840-v11-squashed' into feature17840-v11-merged 2016-01-29 07:37:06 +11:00
dirserv.c A router must be a dir cache before it may be HSDir 2015-12-18 13:14:09 -05:00
dirserv.h Refactor TestingDirAuthVote* into dirserv_set_routerstatus_testing 2015-08-18 14:54:40 +10:00
dirvote.c Let make_consensus_method_list be used in tests 2015-12-18 13:14:10 -05:00
dirvote.h Let make_consensus_method_list be used in tests 2015-12-18 13:14:10 -05:00
dns_structs.h Unit test dns_resolve(), dns_clip_ttl(), dns_get_expiry_ttl(). 2015-08-23 16:02:39 +03:00
dns.c Replace usage of INLINE with inline 2015-12-15 11:34:00 -05:00
dns.h Seventh test case for dns_resolve_impl(). 2015-10-24 14:30:53 +03:00
dnsserv.c More fixes/debugging attempts for 17659 2015-11-27 12:54:57 -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 branch 'feature17840-v11-squashed' into feature17840-v11-merged 2016-01-29 07:37:06 +11:00
entrynodes.h clean up comments and whitespace a bit 2015-02-18 19:27:02 -05:00
eventdns_tor.h Remove eventdns specific inline definition 2015-12-15 11:34:00 -05:00
ext_orport.c Correct grammatical errors in tor comments 2016-01-26 13:46:54 +11:00
ext_orport.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
fallback_dirs.inc Add default fallback directories for the 0.2.8 alpha releases 2016-01-18 20:15:59 -05:00
fp_pair.c Replace usage of INLINE with inline 2015-12-15 11:34:00 -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 Fix a null-pointer deref when writing geoip stats 2015-12-18 10:00:44 -05:00
geoip.h Add tests for directory_handle_command_get 2015-09-15 11:08:50 -05:00
hibernate.c Added AccountRule in and AccountingRule out options 2016-01-08 15:52:10 -08:00
hibernate.h Added AccountRule in and AccountingRule out options 2016-01-08 15:52:10 -08:00
include.am Simplify micro-revision dependency rules 2016-01-08 13:27:36 -08:00
keypin.c Replace usage of INLINE with inline 2015-12-15 11:34:00 -05:00
keypin.h New AuthDirPinKeys option to enable/disable keypinning enforcement 2015-09-23 11:22:26 -04:00
main.c Merge remote-tracking branch 'origin/maint-0.2.7' 2016-01-18 19:52:34 -05:00
main.h Some unit tests now require that periodic events be initialized. 2015-11-17 09:26:50 -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 Replace usage of INLINE with inline 2015-12-15 11:34:00 -05:00
microdesc.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
networkstatus.c Merge branch 'feature12538_028_01_squashed' 2015-12-18 13:16:49 -05:00
networkstatus.h Add unit test for router_pick_directory_server_impl 2015-12-18 13:14:09 -05:00
nodelist.c Merge branch 'feature17840-v11-squashed' into feature17840-v11-merged 2016-01-29 07:37:06 +11:00
nodelist.h Use fascist firewall and ClientUseIPv4 for bridge clients 2016-01-29 07:16:04 +11:00
ntmain.c Wrap windows-only C files in #ifdef _WIN32 2015-07-30 11:14:15 -04:00
ntmain.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
onion_fast.c Now that crypto_rand() cannot fail, it should return void. 2015-11-25 22:29:59 -05:00
onion_fast.h Merge remote-tracking branch 'public/bug9635_warnings_025' 2015-02-02 16:31:32 -05:00
onion_ntor.c Merge remote-tracking branch 'public/bug9635_warnings_025' 2015-02-02 16:31:32 -05:00
onion_ntor.h Merge remote-tracking branch 'public/bug9635_warnings_025' 2015-02-02 16:31:32 -05:00
onion_tap.c Merge remote-tracking branch 'public/bug9635_warnings_025' 2015-02-02 16:31:32 -05:00
onion_tap.h Merge remote-tracking branch 'public/bug9635_warnings_025' 2015-02-02 16:31:32 -05:00
onion.c Merge remote-tracking branch 'public/bug9635_warnings_025' 2015-02-02 16:31:32 -05:00
onion.h Merge remote-tracking branch 'public/bug9635_warnings_025' 2015-02-02 16:31:32 -05:00
or.h Merge branch 'feature17840-v11-squashed' into feature17840-v11-merged 2016-01-29 07:37:06 +11:00
periodic.c Some unit tests now require that periodic events be initialized. 2015-11-17 09:26:50 -05:00
periodic.h Some unit tests now require that periodic events be initialized. 2015-11-17 09:26:50 -05:00
policies.c Automatically use IPv6 when ClientUseIPv4 is 0 2016-01-29 07:16:32 +11:00
policies.h Add firewall_is_fascist_dir() 2016-01-29 07:16:04 +11: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 Correct grammatical errors in tor comments 2016-01-26 13:46:54 +11:00
relay.h Remove lingering mempool code 2015-02-23 11:19:31 -05:00
rendcache.c Mention the expected length of the digests 2015-12-09 10:22:26 -05:00
rendcache.h Yet more memory leaks in the rendcache tests 2015-10-21 10:54:07 -04:00
rendclient.c Merge branch 'feature17840-v11-squashed' into feature17840-v11-merged 2016-01-29 07:37:06 +11:00
rendclient.h Use an enum for INTRO_POINT_FAILURE_* 2015-08-11 09:34:41 -04:00
rendcommon.c Merge branch 'bug17686_v2_027' 2015-11-25 22:33:49 -05:00
rendcommon.h Replace usage of INLINE with inline 2015-12-15 11:34:00 -05:00
rendmid.c Replace Alice/Bob with client/service in hidden service comments 2016-01-26 13:48:31 +11:00
rendmid.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
rendservice.c Replace Alice/Bob with client/service in hidden service comments 2016-01-26 13:48:31 +11:00
rendservice.h Remove empty rend_service_validate_intro_early function 2015-07-14 02:30:04 -04:00
rephist.c Replace usage of INLINE with inline 2015-12-15 11:34:00 -05:00
rephist.h Add link protocol version counts to the heartbeat message 2015-03-10 10:07:41 -04:00
replaycache.c Use SHA256 in the replaycache, rather than SHA1 2015-11-24 09:08:53 +11:00
replaycache.h Use SHA256 in the replaycache, rather than SHA1 2015-11-24 09:08:53 +11:00
router.c Merge branch 'feature17840-v11-squashed' into feature17840-v11-merged 2016-01-29 07:37:06 +11:00
router.h Merge branch 'feature12538_028_01_squashed' 2015-12-18 13:16:49 -05:00
routerkeys.c Fix a memory leak in reading an expired ed signing key. 2015-10-21 11:16:28 -04:00
routerkeys.h Merge branch 'feature16769_squashed' 2015-09-22 09:26:30 -04:00
routerlist.c Merge branch 'feature17840-v11-squashed' into feature17840-v11-merged 2016-01-29 07:37:06 +11:00
routerlist.h Merge branch 'feature17840-v11-squashed' into feature17840-v11-merged 2016-01-29 07:37:06 +11:00
routerparse.c Authorities must set a router's V2Dir flag if it supports tunnelled reqs 2015-12-16 16:15:41 +01:00
routerparse.h Ignore accept6/reject6 IPv4, warn about unexpected rule outcomes 2015-09-16 00:13:03 +10:00
routerset.c Merge remote-tracking branch 'teor/routerset-parse-IPv6-literals' 2015-10-02 13:54:20 +02:00
routerset.h Prohibit the use of one entry node with an HS 2015-09-02 10:47:20 -04:00
scheduler.c Fix scheduler compilation on targets where char is unsigned. 2015-02-06 16:26:28 +00:00
scheduler.h Fix scheduler compilation on targets where char is unsigned. 2015-02-06 16:26:28 +00:00
statefile.c Refactor clock skew warning code to avoid duplication 2015-12-10 19:54:11 -05:00
statefile.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
status.c Added AccountRule in and AccountingRule out options 2016-01-08 15:52:10 -08:00
status.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00
tor_main.c Only return 0..255 from main(). 2015-09-03 11:38:00 -04:00
torcert.c Fix undefined behavior caused by memory overlap 2015-11-30 22:02:22 -05:00
torcert.h Generate weird certificates correctly 2015-05-28 10:47:47 -04:00
transports.c Correct grammatical errors in tor comments 2016-01-26 13:46:54 +11:00
transports.h Bump copyright dates to 2015, in case someday this matters. 2015-01-02 14:27:39 -05:00