Nick Mathewson 084c857704 Merge remote-tracking branch 'origin/maint-0.2.4'

2013-03-19 14:19:19 -04:00

..

addressmap.c

Merge branch '024_msvc_squashed'

2013-01-16 22:32:12 -05:00

addressmap.h

Update the copyright date to 201.

2013-01-16 01:54:56 -05:00

buffers.c

Fix a bug that roger found in the wide_circ_id code

2013-02-15 18:20:46 -05:00

buffers.h

Update the copyright date to 201.

2013-01-16 01:54:56 -05:00

channel.c

Fix 8447: use %u to format circid_t.

2013-03-10 19:52:06 -04:00

channel.h

Merge remote-tracking branch 'public/wide_circ_ids'

2013-02-15 16:23:43 -05:00

channeltls.c

Fix a framing bug when reading versions from a versions cell.

2013-03-11 12:29:28 -04:00

channeltls.h

Update the copyright date to 201.

2013-01-16 01:54:56 -05:00

circuitbuild.c

Merge remote-tracking branch 'public/bug6174' into maint-0.2.4

2013-03-18 16:36:25 -04:00

circuitbuild.h

Downgrade an assert to LD_BUG

2013-02-19 15:02:08 -05:00

circuitlist.c

Merge branch 'bug7582_v2' into maint-0.2.4

2013-03-19 12:29:29 -04:00

circuitlist.h

Rename circuit_expire_all_dirty_circs

2013-02-19 18:37:03 -05:00

circuitmux_ewma.c

Update the copyright date to 201.

2013-01-16 01:54:56 -05:00

circuitmux_ewma.h

Update the copyright date to 201.

2013-01-16 01:54:56 -05:00

circuitmux.c

Fix 8447: use %u to format circid_t.

2013-03-10 19:52:06 -04:00

circuitmux.h

Update the copyright date to 201.

2013-01-16 01:54:56 -05:00

circuitstats.c

Rename and relocate the bw weight scale param getter.

2013-02-01 17:01:22 -05:00

circuitstats.h

Update the copyright date to 201.

2013-01-16 01:54:56 -05:00

circuituse.c

Merge branch 'bug7582_v2' into maint-0.2.4

2013-03-19 12:29:29 -04:00

circuituse.h

Stop frobbing timestamp_dirty as our sole means to mark circuits unusable

2013-02-19 18:29:17 -05:00

command.c

Fix 8447: use %u to format circid_t.

2013-03-10 19:52:06 -04:00

command.h

Update the copyright date to 201.

2013-01-16 01:54:56 -05:00

config_codedigest.c

Resolve about 24 DOCDOCs

2012-06-05 00:17:54 -04:00

config.c

Merge remote-tracking branch 'asn/bug3594_rebased_and_fixed'

2013-03-19 13:25:45 -04:00

config.h

Merge remote-tracking branch 'asn/bug3594_rebased_and_fixed'

2013-03-19 13:25:45 -04:00

confparse.c

Update the copyright date to 201.

2013-01-16 01:54:56 -05:00

confparse.h

Update the copyright date to 201.

2013-01-16 01:54:56 -05:00

connection_edge.c

Merge remote-tracking branch 'public/bug6174' into maint-0.2.4

2013-03-18 16:36:25 -04:00

connection_edge.h

Update the copyright date to 201.

2013-01-16 01:54:56 -05:00

connection_or.c

Fix 8447: use %u to format circid_t.

2013-03-10 19:52:06 -04:00

connection_or.h

Merge remote-tracking branch 'public/wide_circ_ids'

2013-02-15 16:23:43 -05:00

connection.c

Merge remote-tracking branch 'asn/bug3594_rebased_and_fixed'

2013-03-19 13:25:45 -04:00

connection.h

Validate SOCKS arguments.

2013-02-09 16:30:16 +00:00

control.c

Make stream events for RESOLVE lookups more consistent

2013-03-18 15:13:59 -04:00

control.h

Update the copyright date to 201.

2013-01-16 01:54:56 -05:00

cpuworker.c

Check return values from fcntl and setsockopt

2013-03-18 14:28:38 -04:00

cpuworker.h

Merge branch 'time_based_onionqueue_v2' of ssh://git-rw.torproject.org/nickm/tor

2013-01-24 08:10:12 -08:00

directory.c

Add a DisableV2DirectoryInfo_ option to 404 all v2 ns requests

2013-03-10 20:31:53 -04:00

directory.h

Update the copyright date to 201.

2013-01-16 01:54:56 -05:00

dirserv.c

Merge remote-tracking branch 'public/bug6164' into maint-0.2.4

2013-03-18 15:45:49 -04:00

dirserv.h

Merge remote-tracking branch 'andrea/bug8435' into maint-0.2.4

2013-03-18 15:17:11 -04:00

dirvote.c

Merge branch 'bug2286_unit_test_squashed'

2013-02-19 14:54:05 -05:00

dirvote.h

Merge branch 'bug2286_unit_test_squashed'

2013-02-19 14:54:05 -05:00

dns.c

Rename log() to tor_log() for logging

2013-02-01 15:43:37 -05:00

dns.h

Update the copyright date to 201.

2013-01-16 01:54:56 -05:00

dnsserv.c

Fix some wide lines

2013-03-18 15:39:11 -04:00

dnsserv.h

Fix some wide lines

2013-03-18 15:39:11 -04:00

entrynodes.c

Merge remote-tracking branch 'asn/bug3594_rebased_and_fixed'

2013-03-19 13:25:45 -04:00

entrynodes.h

Merge remote-tracking branch 'asn/bug3594_rebased_and_fixed'

2013-03-19 13:25:45 -04:00

eventdns_tor.h

Update the copyright date to 201.

2013-01-16 01:54:56 -05:00

geoip.c

Merge remote-tracking branch 'public/bug7816_023'

2013-02-07 15:20:50 -05:00

geoip.h

Remove dirreq-v2-* lines from extra-info descriptors.

2013-01-17 10:46:34 +01:00

hibernate.c

Remove a bunch of unused macro definitions

2013-02-23 23:05:25 -05:00

hibernate.h

Update the copyright date to 201.

2013-01-16 01:54:56 -05:00

include.am

Actually link against nacl when we want to use it

2013-01-16 13:07:52 -05:00

main.c

Merge remote-tracking branch 'public/bug6174' into maint-0.2.4

2013-03-18 16:36:25 -04:00

main.h

Update the copyright date to 201.

2013-01-16 01:54:56 -05:00

Makefile.nmake

Add ntor-related modules to the Makefiles.nmake

2013-01-17 15:53:36 -05:00

microdesc.c

Merge remote-tracking branch 'public/bug8031' into maint-0.2.4

2013-03-19 14:18:07 -04:00

microdesc.h

Update the copyright date to 201.

2013-01-16 01:54:56 -05:00

networkstatus.c

Remove some totally unused functions

2013-02-23 23:31:31 -05:00

networkstatus.h

Remove some totally unused functions

2013-02-23 23:31:31 -05:00

nodelist.c

On END_REASON_EXITPOLICY, mark circuit as unusable for that address.

2013-03-11 23:37:47 -04:00

nodelist.h

On END_REASON_EXITPOLICY, mark circuit as unusable for that address.

2013-03-11 23:37:47 -04:00

ntmain.c

Update the copyright date to 201.

2013-01-16 01:54:56 -05:00

ntmain.h

Update the copyright date to 201.

2013-01-16 01:54:56 -05:00

onion_fast.c

Update the copyright date to 201.

2013-01-16 01:54:56 -05:00

onion_fast.h

Wrap more macro definitions in (parentheses)

2013-02-09 00:16:04 -05:00

onion_ntor.c

Update the copyright date to 201.

2013-01-16 01:54:56 -05:00

onion_ntor.h

Update the copyright date to 201.

2013-01-16 01:54:56 -05:00

onion_tap.c

Update the copyright date to 201.

2013-01-16 01:54:56 -05:00

onion_tap.h

Update the copyright date to 201.

2013-01-16 01:54:56 -05:00

onion.c

Fix a warning when building with --disable-curve25519

2013-02-04 11:34:23 -05:00

onion.h

Fix an MSVC warning in onion.h prototypes

2013-01-17 14:42:37 -05:00

or.h

Merge remote-tracking branch 'origin/maint-0.2.4'

2013-03-19 14:16:46 -04:00

policies.c

On END_REASON_EXITPOLICY, mark circuit as unusable for that address.

2013-03-11 23:37:47 -04:00

policies.h

On END_REASON_EXITPOLICY, mark circuit as unusable for that address.

2013-03-11 23:37:47 -04:00

reasons.c

When we get an END cell before CONNECTED, don't report SOCKS success

2013-01-16 12:09:49 -05:00

reasons.h

Update the copyright date to 201.

2013-01-16 01:54:56 -05:00

relay.c

Merge branch 'bug7582_v2' into maint-0.2.4

2013-03-19 12:29:29 -04:00

relay.h

Merge remote-tracking branch 'public/wide_circ_ids'

2013-02-15 16:23:43 -05:00

rendclient.c

Fix 8447: use %u to format circid_t.

2013-03-10 19:52:06 -04:00

rendclient.h

Update the copyright date to 201.

2013-01-16 01:54:56 -05:00

rendcommon.c

Remove some totally unused functions

2013-02-23 23:31:31 -05:00

rendcommon.h

Remove some totally unused functions

2013-02-23 23:31:31 -05:00

rendmid.c

Fix 8447: use %u to format circid_t.

2013-03-10 19:52:06 -04:00

rendmid.h

Update the copyright date to 201.

2013-01-16 01:54:56 -05:00

rendservice.c

Fix 8447: use %u to format circid_t.

2013-03-10 19:52:06 -04:00

rendservice.h

Update the copyright date to 201.

2013-01-16 01:54:56 -05:00

rephist.c

Authorities were adding downtime for every relay every restart

2013-02-14 17:02:22 -05:00

rephist.h

When we mark a node as a sybil, mark it down and reset its uptime to 0

2013-02-04 11:11:54 -05:00

replaycache.c

Update the copyright date to 201.

2013-01-16 01:54:56 -05:00

replaycache.h

Update the copyright date to 201.

2013-01-16 01:54:56 -05:00

router.c

Merge remote-tracking branch 'public/unused_stuff' into maint-0.2.4

2013-03-15 12:17:23 -04:00

router.h

Remove a few more unused functions.

2013-03-01 21:57:52 -05:00

routerlist.c

Merge remote-tracking branch 'origin/maint-0.2.4'

2013-03-18 14:50:36 -04:00

routerlist.h

Remove a few more unused functions.

2013-03-01 21:57:52 -05:00

routerparse.c

Check for 0.2.4.8, not 0.2.4.7, to determine EXTEND2 support

2013-03-18 14:23:19 -04:00

routerparse.h

Refactor storing of measured_bw versus Unmeasured=1.

2013-02-19 11:06:24 -05:00

routerset.c

Fix typos in a few log messages

2013-03-10 22:59:19 -04:00

routerset.h

When excluding nodes by country, exclude {??} and {A1} too

2013-01-17 18:07:36 -05:00

statefile.c

Add EntryGuardPathUseBias to state file keyword list.

2013-02-01 17:01:26 -05:00

statefile.h

Update the copyright date to 201.

2013-01-16 01:54:56 -05:00

status.c

Rename log() to tor_log() for logging

2013-02-01 15:43:37 -05:00

status.h

Update the copyright date to 201.

2013-01-16 01:54:56 -05:00

tor_main.c

Fix a comment in tor_main.c

2013-02-25 03:24:53 -05:00

transports.c

Merge remote-tracking branch 'asn/bug3594_rebased_and_fixed'

2013-03-19 13:25:45 -04:00

transports.h

Send SOCKS arguments when doing SOCKS4.

2013-02-09 16:30:16 +00:00