2b5ff52594
Merge branch 'feature17840-v11-tests_truncated'
2016-02-11 12:45:51 -05:00
ba2be81fc3
Merge remote-tracking branch 'teor/feature17840-v11-merged-v2'
2016-02-11 12:20:20 -05:00
cae59b913f
Rename circuit_about_to_free_{terminal -> atexit}
2016-02-11 12:15:12 -05:00
7f9ac4957c
Split a long line
2016-02-11 12:13:02 -05:00
bc7a5eeeda
Merge remote-tracking branch 'weasel/bug18261'
2016-02-11 12:12:02 -05:00
c0a6c34652
Merge remote-tracking branch 'teor/bug18208'
2016-02-10 16:32:05 -05:00
162d2022e1
Merge branch 'bug17682_squashed'
2016-02-10 15:50:28 -05:00
601b41084a
Bulletproof the safe_timer_diff function
...
Originally it can overflow in some weird cases. Now it should no longer
be able to do so.
Additionally, limit main's timers to 30 days rather than to 38 years;
we don't actually want any 38-year timers.
Closes bug 17682.
2016-02-10 15:49:11 -05:00
44ea7af686
Quotes added on configure script's string comparison.
...
Solves #17744
The syntax has been generalized too, so there are only double quotes.
Signed-off-by: zerosion <zerosion@protonmail.ch >
2016-02-10 15:46:39 -05:00
ee75c02691
Merge remote-tracking branch 'andrea/bug18116'
2016-02-10 15:42:11 -05:00
69c47ab5fd
Merge remote-tracking branch 'sebastian/bug18242'
2016-02-10 15:38:52 -05:00
4dc8dc4b89
Merge remote-tracking branch 'public/bug18184'
2016-02-10 15:36:48 -05:00
2123f0a2f9
Make the callgraph module-aware
2016-02-10 15:09:10 -05:00
ae0f858602
Properly detach circuits from cmuxes when calling circuit_free_all() on shutdown again
2016-02-10 05:35:03 +00:00
3014bfb61b
Appease make check-spaces
2016-02-10 02:20:59 +00:00
0c4fa4a923
changes file for bug18051
2016-02-08 08:35:43 -05:00
92048a1b43
Add missing consts; my fault.
2016-02-08 08:34:18 -05:00
9f6589d65a
Merge branch 'decorated_ipv6_directory_send_command_squashed'
2016-02-08 08:33:28 -05:00
061586e36c
decorated ipv6 address for directory send command
2016-02-08 08:33:18 -05:00
d004f06830
fix wide lines, use more locals.
2016-02-08 08:31:31 -05:00
c30be5a82d
Using router_get_my_routerinfo()
2016-02-07 16:07:35 -05:00
42e131e9ac
Fix a segfault during startup
...
If unix socket was configured as listener (such as a ControlSocket or a
SocksPort unix socket), and tor was started as root but not configured
to switch to another user, tor would segfault while trying to string
compare a NULL value. Fixes bug 18261; bugfix on 0.2.8.1-alpha. Patch
by weasel.
2016-02-06 22:17:02 +01:00
2d879bd39f
Document port_out argument to tor_addr_from_sockaddr
2016-02-06 15:34:47 -05:00
0f5f6b8a41
Merge remote-tracking branch 'yawning/bug18221'
2016-02-06 15:30:22 -05:00
b645e2f2b0
Merge remote-tracking branch 'alec/dead_code_removal'
2016-02-06 15:08:49 -05:00
6852868b4a
Removed dead code in main.c
2016-02-06 14:41:31 -05:00
928380e231
Credit the patch
2016-02-06 14:12:48 -05:00
31a27729b9
Fix spaces.
2016-02-06 14:00:24 -05:00
03371e3d3c
Merge branch 'cleaned_aes_crypt'
2016-02-06 13:54:09 -05:00
ef5f35971f
changes file for bug 18258.
2016-02-06 13:51:46 -05:00
a9cd291753
Removed aes_crypt, left only aes_crypt_inplace. Removed should_use_openssl_CTR, was used for openssl 1.0.0 bug.
2016-02-06 13:38:11 -05:00
f3a0de0c2c
add a changes file
2016-02-06 12:37:56 -05:00
edd93f9de8
changing output of crypto_cipher_crypt_inplace from int to void
2016-02-06 12:14:39 -05:00
55d6fd27cb
Fix the --disable-asserts-in-tests configure option
2016-02-05 14:40:07 +01:00
1f5cdf2b6c
Merge branch 'maint-0.2.7'
2016-02-05 08:13:47 -05:00
d920cbb82c
Merge branch 'maint-0.2.6' into maint-0.2.7
2016-02-05 08:13:35 -05:00
44ad3be221
Merge branch 'maint-0.2.5' into maint-0.2.6
2016-02-05 08:13:24 -05:00
f06d9a9cef
Merge branch 'maint-0.2.4' into maint-0.2.5
2016-02-05 08:13:13 -05:00
6149703089
Bump to 0.2.8.1-alpha-dev
2016-02-04 18:24:20 -05:00
c91a4cae99
whoops, needs a release date.
2016-02-04 18:23:01 -05:00
9093e37697
Call them relays in the changelog, not servers.
2016-02-04 13:39:38 -05:00
805dfa191b
Reflow a paragraph in the changelog
2016-02-04 13:35:40 -05:00
32b8734ba5
dgoulet found some typos in the changelog
2016-02-04 13:25:20 -05:00
abc9ce324e
Merge branch 'always_init_base'
2016-02-04 13:20:21 -05:00
532a43ed3f
Reflow the changelog again.
2016-02-04 13:19:07 -05:00
0fb77ca4a3
update the changelog more
2016-02-04 13:18:49 -05:00
5d63cbf7f9
whoops, add a changes file for 18242.
2016-02-04 12:54:54 -05:00
af116081f9
Make the no-assertions-during-coverage check into a configure option
...
Closes ticket 18242.
The rationale here is that I like having coverage on by default in my
own working directory, but I always want assertions turned on unless
I'm doing branch coverage specifically.
2016-02-04 12:51:52 -05:00
1bac468882
Fix two problems in the 0.2.8.x unit tests
...
1. We were sometimes using libevent uninitialized, which is Not Allowed.
2. The malformed-PTR dns test was supposed to get a -1 output... but
the test was wrong, since it forgot that in-addr.arpa addresses
are in reverse order.
Bugs not in any released tor.
2016-02-04 12:30:48 -05:00
5da517e689
Bump version. (This is not yet the release.)
2016-02-04 10:07:06 -05:00
Nick Mathewson
zerosion
Andrea Shepard
Malek
Harini Kannan
Peter Palfrader
Alec Heifetz
Hassan Alsibyani
Sebastian Hahn