teor c08d3e46ca Merge commit '73890a86ef' into maint-0.4.1 ...

tor-github/pr/1283, with the following changes:
* cherry-pick the merge commit in 1283 on top of...
* tor-github/pr/1174, but with the last commit re-worded to remove
    the fixup, because fixups break our push rules.

This is an "ours" merge, except for the bugfix version change in
changes/bug30649.

2019-09-05 12:04:27 +10:00

..

.dummy

Add a .dummy file in the changes directory to stop git from removing it

2015-05-11 11:41:48 -04:00

bug12399

Change loglevel of message 'Hash of session info was not as expected'

2019-09-02 14:09:39 -04:00

bug22619

Merge branch 'bug30649_040' into bug30649_maint_041

2019-09-05 11:48:03 +10:00

bug23507

Merge branch 'bug30649_040' into bug30649_maint_041

2019-09-05 11:48:03 +10:00

bug23818_v2

Merge branch 'bug30649_040' into bug30649_maint_041

2019-09-05 11:48:03 +10:00

bug23818_v3

Merge branch 'bug30649_040' into bug30649_maint_041

2019-09-05 11:48:03 +10:00

bug29034

Merge branch 'bug30649_040' into bug30649_maint_041

2019-09-05 11:48:03 +10:00

bug30649

Fix bugfix version in Bug 30649: Changes file.

2019-09-05 11:46:25 +10:00

bug30713

Travis: Skip test_rebind on macOS builds

2019-06-10 20:49:59 +10:00

bug30744

Travis: allow the test-stem job to fail

2019-06-10 19:18:35 +10:00

bug30781

Merge branch 'bug30649_040' into bug30649_maint_041

2019-09-05 11:48:03 +10:00

bug30894

Merge branch 'bug30649_040' into bug30649_maint_041

2019-09-05 11:48:03 +10:00

bug30942

Merge branch 'bug30649_040' into bug30649_maint_041

2019-09-05 11:48:03 +10:00

bug30956

Merge branch 'bug30649_040' into bug30649_maint_041

2019-09-05 11:48:03 +10:00

bug31003

Merge branch 'bug30649_040' into bug30649_maint_041

2019-09-05 11:48:03 +10:00

bug31024

Merge branch 'bug30649_040' into bug30649_maint_041

2019-09-05 11:48:03 +10:00

bug31027

Merge branch 'bug30649_040' into bug30649_maint_041

2019-09-05 11:48:03 +10:00

bug31080_041

Merge branch 'bug30649_040' into bug30649_maint_041

2019-09-05 11:48:03 +10:00

bug31343

Merge branch 'bug30649_040' into bug30649_maint_041

2019-09-05 11:48:03 +10:00

bug31356_and_logs

Merge branch 'bug30649_040' into bug30649_maint_041

2019-09-05 11:48:03 +10:00

bug31463

Merge branch 'bug30649_040' into bug30649_maint_041

2019-09-05 11:48:03 +10:00

chutney_ci

Merge branch 'bug30649_040' into bug30649_maint_041

2019-09-05 11:48:03 +10:00

doc30630

Merge branch 'bug30649_040' into bug30649_maint_041

2019-09-05 11:48:03 +10:00

geoip-2019-06-10

Update geoip and geoip6 to the June 10 2019 database.

2019-06-11 16:12:50 +02:00

ticket28795

changes: file for 28795

2019-06-28 21:38:33 +10:00

ticket30591

Merge branch 'bug30649_040' into bug30649_maint_041

2019-09-05 11:48:03 +10:00

ticket30686

Merge branch 'bug30649_040' into bug30649_maint_041

2019-09-05 11:48:03 +10:00

ticket30694

Merge branch 'bug30649_040' into bug30649_maint_041

2019-09-05 11:48:03 +10:00

ticket30871

Merge branch 'bug30649_040' into bug30649_maint_041

2019-09-05 11:48:03 +10:00

ticket31001

Merge branch 'bug30649_040' into bug30649_maint_041

2019-09-05 11:48:03 +10:00

ticket31311

Merge branch 'bug30649_040' into bug30649_maint_041

2019-09-05 11:48:03 +10:00

ticket31374

Merge branch 'bug30649_040' into bug30649_maint_041

2019-09-05 11:48:03 +10:00

ticket31406

Merge branch 'bug30649_040' into bug30649_maint_041

2019-09-05 11:48:03 +10:00

ticket31554

test: Change "make test-stem" so it only runs the stem tests that use tor

2019-08-29 21:56:16 +10:00