6ea9d3fd42
Merge branch 'maint-0.2.8'
2016-07-05 12:58:28 -04:00
717eae3b8f
Appease lint-changes script.
2016-07-05 12:58:05 -04:00
8cae4abbac
Merge branch 'maint-0.2.8'
2016-07-05 12:43:17 -04:00
8d25ab6347
Merge remote-tracking branch 'weasel/bug19557' into maint-0.2.8
2016-07-05 12:40:25 -04:00
74cbbda86e
Merge remote-tracking branch 'weasel/bug19556' into maint-0.2.8
2016-07-05 12:39:40 -04:00
3f33a5b1e7
Run asciidoc in UTC timezone for build reproducibility.
...
asciidoc adds a timestamp at the end of a generated HTML file.
This timestamp is based on the date of the file but it can change
depending on the TZ environment variable.
2016-07-05 12:38:24 -04:00
55d380f3df
sandboxing: allow writing to stats/hidserv-stats
...
Our sandboxing code would not allow us to write to stats/hidserv-stats,
causing tor to abort while trying to write stats. This was previously
masked by bug#19556.
2016-07-03 18:05:43 +02:00
51b5d09c94
Note which bug this fixes in the changes entry
2016-07-03 18:04:33 +02:00
2c4e78d95b
sandboxing: allow open() of stats dir
...
When sandboxing is enabled, we could not write any stats to disk.
check_or_create_data_subdir("stats"), which prepares the private stats
directory, calls check_private_dir(), which also opens and not just stats() the
directory. Therefore, we need to also allow open() for the stats dir in our
sandboxing setup.
2016-07-03 17:47:45 +02:00
aaa3129043
Merge remote-tracking branch 'dgoulet/ticket16943_029_05-squashed'
...
Trivial Conflicts:
src/or/or.h
src/or/routerparse.c
2016-07-01 15:29:05 -04:00
b12d4852ef
prop250: Add changes file
...
Fixes #16943
Signed-off-by: David Goulet <dgoulet@torproject.org >
Signed-off-by: George Kadianakis <desnacked@riseup.net >
2016-07-01 14:01:41 -04:00
0531d5155e
Merge remote-tracking branch 'teor/bug19530-v2'
2016-07-01 10:00:37 -04:00
903ec20c0b
Merge branch 'maint-0.2.8'
2016-07-01 09:54:08 -04:00
744077dd15
When tor can't find a directory, log less
2016-07-01 14:26:00 +10:00
befd2e3d7f
Changes file for #19530
2016-07-01 14:06:24 +10:00
cb54390e0f
Merge remote-tracking branch 'andrea/ticket19323_squashed'
2016-06-30 11:44:58 -04:00
9a76415c77
tweak 18322 changelog
2016-06-30 11:18:49 -04:00
c6846d7bf0
Merge remote-tracking branch 'andrea/bug18322_v3_squashed'
2016-06-30 11:18:00 -04:00
2442673ef6
Changes file for bug 18322
2016-06-30 07:03:24 +00:00
11ba7f0037
Merge remote-tracking branch 'weasel/bug19504'
2016-06-29 16:18:00 -04:00
ff5b10c916
changes-on for 19505
2016-06-29 16:17:17 -04:00
560e976e4b
Merge remote-tracking branch 'weasel/bug19505'
2016-06-29 16:12:15 -04:00
2fb177e8c9
bugfix stanza in changes file for 19503
2016-06-29 16:10:35 -04:00
7602b0b31f
Merge remote-tracking branch 'weasel/bug19503'
2016-06-29 16:10:10 -04:00
79b2ba8598
changes file for 19449
2016-06-29 14:58:27 -04:00
8938250c10
Add changes file for bug19483
2016-06-29 17:23:46 +10:00
d511c673c3
Changes file for ticket 19323
2016-06-29 06:57:57 +00:00
f42dbc4e26
Merge branch 'maint-0.2.8'
2016-06-28 19:15:43 -04:00
2c9354fc10
Merge branch 'bug19071-extra-squashed' into maint-0.2.8
2016-06-28 19:15:20 -04:00
26146dbe9e
Comment-out fallbacks in a way the stem fallback parser understands
...
If we manually remove fallbacks in C by adding '/*' and '*/' on separate
lines, stem still parses them as being present, because it only looks at
the start of a line.
Add a comment to this effect in the generated source code.
2016-06-28 19:15:08 -04:00
d793a988cd
Merge branch 'maint-0.2.8'
2016-06-28 11:22:48 -04:00
f87aa4555d
Merge remote-tracking branch 'teor/bug18812' into maint-0.2.8
2016-06-28 11:12:51 -04:00
608c12baaf
Resolve bug18812 by logging fallback key changes at info level
2016-06-28 14:18:16 +10:00
2197bfcc6a
Merge branch 'maint-0.2.8'
2016-06-27 13:17:42 -04:00
135800f75c
tor-gencert.1: fix --passphrase-fd description
2016-06-25 16:48:42 +02:00
90f85b012a
Document the --passphrase-fd option in the tor manpage
2016-06-25 16:44:41 +02:00
54c3066c72
Fix a typo in the getting passphrase prompt for the ed25519 identity key
2016-06-25 13:33:35 +02:00
0116eae59a
Bug19499: Fix GCC warnings when building against bleeding edge OpenSSL.
...
The previous version of the new accessors didn't specify const but it
was changed in master.
2016-06-24 22:20:41 +00:00
703254a832
Merge remote-tracking branch 'public/bug15942_v2_alternative'
2016-06-23 09:01:24 -04:00
61dac57aa3
Merge branch 'maint-0.2.8'
2016-06-22 08:20:11 -04:00
421a7c8c35
Changes file for 19071 and 19480
2016-06-22 12:37:59 +10:00
cb8557f7c9
Merge branch 'maint-0.2.8'
2016-06-21 09:00:40 -04:00
b432efb838
Remove useless message about nonexistent onion services after uploading a descriptor
2016-06-21 09:00:22 -04:00
dd9cebf109
Merge branch 'maint-0.2.8'
2016-06-21 08:54:49 -04:00
f038e9cb00
Fix bug when disabling heartbeats.
...
Callbacks can't return 0.
2016-06-21 08:54:30 -04:00
1160ac1283
Changes file for 19063; use the BUG macro
2016-06-19 12:38:15 -04:00
81cfd5c9a1
Merge branch 'zlib_coverage_squashed'
2016-06-19 12:20:38 -04:00
808015316a
Remove support for zlib <= 1.1
...
zlib 1.2 came out in 2003; earlier versions should be dead by now.
Our workaround code was only preventing us from using the gzip
encoding (if we decide to do so), and having some dead code linger
around in torgzip.c
2016-06-19 12:20:24 -04:00
b421648da2
Merge remote-tracking branch 'public/thread_coverage'
2016-06-19 12:15:55 -04:00
2c96d95c12
Fix spelling of --enable-tor2web-mode in manpage
...
Fixes bug 19153; patch from "U+039b", who is apparently an uppercase
lambda?
2016-06-19 12:14:28 -04:00
Nick Mathewson
intrigeri
Peter Palfrader
David Goulet
teor (Tim Wilson-Brown)
Andrea Shepard
Yawning Angel
Ivan Markin
George Kadianakis