teor f8ffb57bc4 Merge branch 'master' of https://git.torproject.org/tor into bug13111-empty-key-files-fn-empty ...

Conflicts:
  src/or/connection_edge.c
Merged in favour of origin.

2015-01-10 17:20:06 +11: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

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

bug13661

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

2014-11-05 13:29:28 -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

bug14072

Use package-config output for -lsystemd correctly

2015-01-06 14:07:13 -05: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

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