Nick Mathewson
7babf33239
Merge remote-tracking branch 'public/bug18716_027' into maint-0.2.8
2016-04-12 13:02:02 -04:00
Nick Mathewson
1a065cea46
Do not link tests against both libor.a and libor-testing.a
...
Also, put libor-testing.a at a better position in the list of
libraries, to avoid linker errors.
This is a fix, or part of a fix, for 18490.
Conflicts:
src/test/include.am
2016-04-12 02:48:46 +00:00
Nick Mathewson
39c057d45a
memarea: Don't assume that sizeof(ulong) >= sizeof(void*).
...
Fixes bug 18716; bugfix on 0.2.1.1-alpha where memarea.c was
introduced. Found by wbenny.
2016-04-07 11:10:14 -04:00
David Goulet
40827da3bf
Turn TestingClientBootstrap* into non-testing options
...
This changes simply renames them by removing "Testing" in front of them and
they do not require TestingTorNetwork to be enabled anymore.
Fixes #18481
Signed-off-by: David Goulet <dgoulet@ev0ke.net>
2016-04-07 10:57:59 -04:00
Nick Mathewson
d8a056daed
Merge branch 'maint-0.2.7' into maint-0.2.8
2016-04-07 10:46:07 -04:00
Nick Mathewson
ad4ff7a5b9
Merge branch 'maint-0.2.6' into maint-0.2.7
2016-04-07 10:45:46 -04:00
Nick Mathewson
2ce99b9f48
Merge branch 'maint-0.2.5' into maint-0.2.6
2016-04-07 10:45:38 -04:00
Nick Mathewson
34a51d1621
Merge branch 'maint-0.2.4' into maint-0.2.5
2016-04-07 10:45:32 -04:00
Karsten Loesing
97c6e717b9
Update geoip and geoip6 to the April 5 2016 database.
2016-04-07 11:10:09 +02:00
Nick Mathewson
f6ffe532ab
Merge branch 'bug18728_028' into maint-0.2.8
2016-04-05 23:56:05 -04:00
Nick Mathewson
d7a0382ba3
Don't call the system toupper or tolower.
...
Yes, we could cast to unsigned char first, but it's probably safest
to just use our own (in test_util), or remove bad-idea features that
we don't use (in readpassphrase.c).
Fixes 18728.
2016-04-05 23:22:28 -04:00
Roger Dingledine
d037369e56
quiet debug logs from periodic_event_dispatch()
...
Stop blasting twelve lines per second from periodic_event_dispatch()
at loglevel debug.
Resolves ticket 18729; fix on 0.2.8.1-alpha.
2016-04-05 23:13:55 -04:00
Nick Mathewson
967491f156
Only define NEW_THREAD_API when not building with LibreSSL.
2016-04-05 10:38:15 -04:00
Yawning Angel
92ae6b9524
Add a changes file for the OpenSSL 1.1.0 compilation fixes.
2016-04-05 10:03:25 -04:00
Yawning Angel
5db21f8f81
OpenSSL 1.1.0-pre5-dev and later made BIO opaque.
...
Detect newer versions and fix our TLS code to use the new API.
2016-04-05 10:03:24 -04:00
Yawning Angel
6729d7328c
OpenSSL 1.1.0-pre4 and later(?) have a new "thread API".
...
It appears that setting the various callbacks is no longer required, so
don't.
2016-04-05 10:03:24 -04:00
Nick Mathewson
fdb57db581
Merge branch 'bug18133_027' into maint-0.2.8
2016-04-01 08:17:56 -04:00
Nick Mathewson
4093f343ca
fix indentation
2016-04-01 08:16:21 -04:00
Nick Mathewson
e247093e0e
Merge remote-tracking branch 'karsten/task-18460-2' into maint-0.2.8
2016-04-01 08:10:58 -04:00
Andrea Shepard
183d465f0e
Merge branch 'bug15221_027' into maint-0.2.7
2016-03-30 12:23:42 +00:00
Andrea Shepard
0b45cab147
Merge branch 'bug18570_027' into maint-0.2.7
2016-03-29 15:01:36 +00:00
Andrea Shepard
1218d731d1
Merge branch 'bug16248_027' into maint-0.2.7
2016-03-29 14:33:45 +00:00
Nick Mathewson
ba87f5bb25
Fix my dumb unreleased bug in 18673
2016-03-28 20:09:09 -04:00
Nick Mathewson
f780d196a9
Merge branch 'bug18673_028_v2' into maint-0.2.8
2016-03-28 16:13:39 -04:00
Nick Mathewson
79e534859b
Merge remote-tracking branch 'sebastian/onlyonly' into maint-0.2.8
2016-03-28 16:13:02 -04:00
Nick Mathewson
c8eb39d67f
Remove a couple of redundant lines from the makefile
...
Fixes the last case of 17744.
2016-03-28 16:11:25 -04:00
Nick Mathewson
a3f36bfd81
and NOW the version is 0.2.8.2-alpha-dev
2016-03-28 15:53:17 -04:00
Nick Mathewson
684babee84
rewrap changelog
2016-03-28 13:54:50 -04:00
Roger Dingledine
a1cc966685
minor changelog cleanups to help the new alpha
2016-03-28 13:20:51 -04:00
Nick Mathewson
2eb2269f8c
changelog fixes from arma
2016-03-28 12:51:28 -04:00
Nick Mathewson
5b12642d09
Bump version correctly this time
2016-03-28 11:22:20 -04:00
Nick Mathewson
a0f0e43c87
typo fix
2016-03-28 11:22:12 -04:00
Nick Mathewson
addd181721
Fix memory leak in TestingEnableCellStatsEvent
...
Only when we were actually flushing the cell stats to a controller
would we free them. Thus, they could stay in RAM even after the
circuit was freed (eg if we didn't have any controllers).
Fixes bug 18673; bugfix on 0.2.5.1-alpha.
2016-03-28 11:12:15 -04:00
Nick Mathewson
362d712aa8
Rescroll changelog
2016-03-28 11:10:45 -04:00
Nick Mathewson
b755f57dcc
grammar fixes from sebastian
2016-03-28 11:10:34 -04:00
Nick Mathewson
65db5ae566
Fix a version number in the changelog
2016-03-28 10:26:31 -04:00
Nick Mathewson
25a21acd5b
reflow changelog
2016-03-28 10:24:39 -04:00
Nick Mathewson
68e663f777
Fix memory leaks that stopped chutney working with asan
2016-03-28 10:24:28 -04:00
Nick Mathewson
1d315b28a2
Fix a memory leak in tor-gencert.
...
This way I can run chutney under asan.
Fixes part of 18672.
2016-03-28 10:21:41 -04:00
Nick Mathewson
fc877b3c9e
Bump the version number
2016-03-28 09:32:14 -04:00
Nick Mathewson
87ee21c0ae
Pick a date
2016-03-28 09:29:57 -04:00
Nick Mathewson
54dab73464
Reflow the 0282 changelog
2016-03-28 09:29:17 -04:00
Nick Mathewson
474b00d9fd
Light editing and moving on the changelog
2016-03-28 09:29:01 -04:00
Nick Mathewson
301235fb2a
Fold entries into changelog
2016-03-28 09:06:09 -04:00
Nick Mathewson
32e8886314
One more test that didnt pass on windows. See #18665 .
2016-03-28 08:57:29 -04:00
Nick Mathewson
9604a5ba91
Fix memory-counting error in rephist.c. Bug 18651. (Now with actual patch)
2016-03-28 07:40:20 -04:00
Nick Mathewson
c4e5296892
Fix memory-counting error in rephist.c. Bug 18651.
2016-03-28 07:39:47 -04:00
Sebastian Hahn
7d6e7fdd03
Remove redundant only in manpage
2016-03-27 22:22:29 +02:00
Nick Mathewson
560450f2fb
helper script to highlight undocumented members
2016-03-26 10:31:59 -04:00
Nick Mathewson
4895d8288c
Do not treat "DOCDOC" as doxygen.
2016-03-26 10:11:45 -04:00
