Nick Mathewson 4b23b398a3 Merge branch 'bug8546_squashed' ...

Conflicts:
	src/or/connection.c
	src/or/or.h
	src/or/relay.c

2015-01-16 09:31:50 -05:00

..

bug8546

changes file for bug 8546

2015-01-16 09:23:03 -05:00

bug9286

Stop accepting milliseconds in various directory contexts

2015-01-07 10:05:55 -05:00

bug11791

Use smaller zlib objects when under memory pressure

2014-11-17 11:43:50 -05:00

bug12509

Prevent changes to other options from removing . from AutomapHostsSuffixes

2015-01-04 17:28:54 -05:00

bug12585

update bug12585 changes file

2015-01-13 13:13:19 -05:00

bug12985

Clarify why bug12985 is a thing

2015-01-07 11:52:24 -05:00

bug13111-generate-keys-on-empty-file

Test that tor correctly handles zero-length keys

2015-01-10 17:14:29 +11:00

bug13397

Tolerate relative paths for torrc files with RunAsDaemon

2015-01-04 19:34:38 -05:00

bug13401

Speed up hidden service bootstrap by reducing the initial post delay

2015-01-10 22:34:29 +11:00

bug13661

Fix version number parsing to allow 2- and 3-part versions.

2014-11-05 13:29:28 -05:00

bug13805

changes file for bug13805

2015-01-11 11:27:33 -05:00

bug13806

When OOM, free cached hidden service descriptors too.

2015-01-12 13:47:52 -05:00

bug13988

Increase bandwidth usage report interval to 4 hours.

2014-12-22 12:24:13 -05:00

bug14001-clang-warning

Start on a changelog for 0.2.6.2-alpha

2014-12-22 10:02:18 -05:00

bug14067-TestingDirAuthVoteHSDir

Create TestingDirAuthVoteHSDir like TestingDirAuthVoteExit/Guard

2015-01-10 22:34:28 +11:00

bug14072

Use package-config output for -lsystemd correctly

2015-01-06 14:07:13 -05:00

bug14090

Restrict sample values of the Laplace distribution to int64_t.

2015-01-15 14:43:58 +00:00

bug14106

Tolerate starting up with missing hidden service directory

2015-01-05 11:39:38 -05:00

bug14116_025

Don't crash on malformed EXTENDCIRCUIT.

2015-01-06 08:49:57 -05:00

bug14123

changes file for 4385211caf

2015-01-06 13:45:57 -05:00

bug14125

Enlarge the buffer for a line in a bw file

2015-01-07 12:44:16 +01:00

bug14129

Avoid attempts to double-remove edge connections from the DNS resolver.

2015-01-08 11:00:21 -05:00

bug14141

changes file for 14141

2015-01-11 11:19:12 -05:00

bug14142-parse-virtual-addr

Don't crash on torrc Vi[rtualAddrNetworkIPv[4|6]] with no option value

2015-01-11 11:05:00 -05:00

bug14149

New minimum uptime to become an HSDir is 96 hours.

2015-01-14 12:48:09 +00:00

bug14195

Remove needless strdup in addressmap_register_virtual_address()

2015-01-13 12:24:42 -05:00

bug14207

Add string for IP_NOW_REDUNDANT in circuit_end_reason_to_control_string

2015-01-15 11:53:20 -05:00

bug14215

Fix the checkdir/perms test when umask==077

2015-01-15 10:24:27 -05:00

bug14220

Ignore warning for redundant decl in openssl/srtp.h

2015-01-15 12:38:08 -05:00

feature10067

changes file for 10067

2015-01-06 14:31:20 -05:00

fix-test-cmdline-args

Make test_cmdline_args.py work on Windows

2015-01-06 13:26:52 -05:00

ticket14107

make "make test-stem" run stem tests on tor

2015-01-06 09:03:44 -05:00

ticket14128

GETINFO bw-event-cache to get information on recent BW events

2015-01-07 13:19:43 -05:00