Commit Graph

4228 Commits

Author SHA1 Message Date
Nick Mathewson aeb95c2091 Merge branch 'maint-0.2.8' into release-0.2.8 2016-07-05 12:58:18 -04:00
Nick Mathewson 717eae3b8f Appease lint-changes script. 2016-07-05 12:58:05 -04:00
Nick Mathewson e512e6ca59 Merge branch 'maint-0.2.8' into release-0.2.8 2016-07-05 12:43:13 -04:00
Nick Mathewson 8d25ab6347 Merge remote-tracking branch 'weasel/bug19557' into maint-0.2.8 2016-07-05 12:40:25 -04:00
Nick Mathewson 74cbbda86e Merge remote-tracking branch 'weasel/bug19556' into maint-0.2.8 2016-07-05 12:39:40 -04:00
intrigeri 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
Peter Palfrader 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
Peter Palfrader 51b5d09c94 Note which bug this fixes in the changes entry 2016-07-03 18:04:33 +02:00
Peter Palfrader 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
Nick Mathewson 017245074e Merge branch 'maint-0.2.8' into release-0.2.8 2016-07-01 09:54:01 -04:00
teor (Tim Wilson-Brown) 744077dd15 When tor can't find a directory, log less 2016-07-01 14:26:00 +10:00
Nick Mathewson 34879d0a4b Merge branch 'maint-0.2.8' into release-0.2.8 2016-06-28 19:15:32 -04:00
Nick Mathewson 2c9354fc10 Merge branch 'bug19071-extra-squashed' into maint-0.2.8 2016-06-28 19:15:20 -04:00
teor (Tim Wilson-Brown) 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
Nick Mathewson 87ea2b6655 Merge branch 'maint-0.2.8' into release-0.2.8 2016-06-28 11:22:39 -04:00
Nick Mathewson f87aa4555d Merge remote-tracking branch 'teor/bug18812' into maint-0.2.8 2016-06-28 11:12:51 -04:00
teor (Tim Wilson-Brown) 608c12baaf Resolve bug18812 by logging fallback key changes at info level 2016-06-28 14:18:16 +10:00
Nick Mathewson 5b57f88f60 Merge branch 'maint-0.2.8' into release-0.2.8 2016-06-27 13:20:57 -04:00
Yawning Angel 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
Nick Mathewson cc6fcbde4e Merge branch 'maint-0.2.8' into release-0.2.8 2016-06-22 08:19:51 -04:00
teor (Tim Wilson-Brown) 421a7c8c35 Changes file for 19071 and 19480 2016-06-22 12:37:59 +10:00
Nick Mathewson cf13189064 Merge branch 'maint-0.2.8' into release-0.2.8 2016-06-21 09:00:37 -04:00
Ivan Markin b432efb838 Remove useless message about nonexistent onion services after uploading a descriptor 2016-06-21 09:00:22 -04:00
Nick Mathewson a839ed5cc1 Merge branch 'maint-0.2.8' into release-0.2.8 2016-06-21 08:54:39 -04:00
George Kadianakis f038e9cb00 Fix bug when disabling heartbeats.
Callbacks can't return 0.
2016-06-21 08:54:30 -04:00
Nick Mathewson 299f892815 One more changelog entry. 2016-06-14 13:42:48 -04:00
Nick Mathewson b74ce86830 Merge branch 'maint-0.2.8' into release-0.2.8 2016-06-14 12:23:00 -04:00
Yawning Angel b217e4ac65 Bug 19406: Add a changes file. 2016-06-14 12:13:09 -04:00
Nick Mathewson 8760325550 Merge branch 'maint-0.2.8' into release-0.2.8 2016-06-13 13:57:09 -04:00
Nick Mathewson 60b8aaefa1 lintChanges fixes 2016-06-13 13:57:03 -04:00
Nick Mathewson ef87106583 Merge branch 'maint-0.2.8' into release-0.2.8 2016-06-13 10:49:15 -04:00
Nick Mathewson 2ee3dbe801 Merge branch 'maint-0.2.7' into maint-0.2.8 2016-06-13 10:49:05 -04:00
Nick Mathewson 80089c9e7c Merge branch 'maint-0.2.6' into maint-0.2.7 2016-06-13 10:48:56 -04:00
Nick Mathewson b4bb88606e Merge branch 'maint-0.2.5' into maint-0.2.6 2016-06-13 10:48:48 -04:00
Nick Mathewson f25f7b759c Merge branch 'maint-0.2.4' into maint-0.2.5 2016-06-13 10:48:35 -04:00
Karsten Loesing c14c662758 Update geoip and geoip6 to the June 7 2016 database. 2016-06-12 11:35:50 +02:00
Nick Mathewson 2728a12232 Merge branch 'maint-0.2.8' into release-0.2.8 2016-06-11 10:16:36 -04:00
Nick Mathewson ada5668c5e Merge remote-tracking branch 'public/bug19203_027' into maint-0.2.8 2016-06-11 10:16:00 -04:00
Nick Mathewson 399eebea54 Merge branch 'maint-0.2.8' into release-0.2.8 2016-06-06 10:17:57 -04:00
Nick Mathewson 6eeedc02d8 Use directory_must_use_begindir to predict we'll surely use begindir
Previously, we used !directory_fetches_from_authorities() to predict
that we would tunnel connections.  But the rules have changed
somewhat over the course of 0.2.8
2016-06-02 10:40:39 -04:00
Nick Mathewson a32ca313c4 Merge branch 'maint-0.2.7' into maint-0.2.8 2016-06-02 10:12:56 -04:00
Nick Mathewson 5854b19816 Use tor_sscanf, not sscanf, in test_util.c.
Fixes the 0.2.7 case of bug #19213, which prevented mingw64 from
working.
2016-06-02 10:11:29 -04:00
Nick Mathewson bdc59e33c1 Fix a warning on unnamed nodes in node_get_by_nickname().
There was a > that should have been an ==, and a missing !.  These
together prevented us from issuing a warning in the case that a
nickname matched an Unnamed node only.

Fixes bug 19203; bugfix on 0.2.3.1-alpha.
2016-05-30 12:03:03 -04:00
Nick Mathewson b28acba3c3 Fold one more item into 0.2.8 changelog; hope it will be today? 2016-05-26 12:10:26 -04:00
Nick Mathewson 3e2d061397 Merge branch 'maint-0.2.8' into release-0.2.8 2016-05-25 16:58:58 -04:00
Nick Mathewson 36b2b48308 Merge branch 'bug18668_028' into maint-0.2.8 2016-05-25 16:58:43 -04:00
Nick Mathewson 693e48a5a4 Fold new entries into 0.2.8.3-alpha changelog. 2016-05-25 10:29:15 -04:00
Nick Mathewson 9d199893fe Merge branch 'maint-0.2.8' into release-0.2.8 2016-05-25 10:21:04 -04:00
Nick Mathewson 6d375f17fc Merge branch 'bug19161_028_v2' into maint-0.2.8 2016-05-25 10:17:26 -04:00
Nick Mathewson b5e2b3844a cMerge branch 'maint-0.2.8' into release-0.2.8 2016-05-25 09:27:35 -04:00