]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
10 years agoRemove changes files for patches in 0.2.6.6 or earlier.
Nick Mathewson [Tue, 24 Mar 2015 13:38:46 +0000 (09:38 -0400)] 
Remove changes files for patches in 0.2.6.6 or earlier.

10 years agoStart adding people to the packager list in doc/HACKING
Nick Mathewson [Tue, 24 Mar 2015 13:29:28 +0000 (09:29 -0400)] 
Start adding people to the packager list in doc/HACKING

10 years agoMerge remote-tracking branch 'origin/maint-0.2.6'
Nick Mathewson [Mon, 23 Mar 2015 13:25:35 +0000 (09:25 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.6'

10 years agoMerge remote-tracking branch 'public/bug15436_025' into maint-0.2.6
Nick Mathewson [Mon, 23 Mar 2015 13:25:15 +0000 (09:25 -0400)] 
Merge remote-tracking branch 'public/bug15436_025' into maint-0.2.6

10 years agoFix unaligned access in SipHash-2-4.
Yawning Angel [Sun, 22 Mar 2015 22:31:08 +0000 (22:31 +0000)] 
Fix unaligned access in SipHash-2-4.

The compiler is allowed to assume that a "uint64_t *" is aligned
correctly, and will inline a version of memcpy that acts as such.

Use "uint8_t *", so the compiler does the right thing.

10 years agoMerge remote-tracking branch 'origin/maint-0.2.6'
Nick Mathewson [Wed, 18 Mar 2015 20:33:11 +0000 (16:33 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.6'

10 years agobump to 0.2.6.5-rc.dev
Nick Mathewson [Wed, 18 Mar 2015 20:32:13 +0000 (16:32 -0400)] 
bump to 0.2.6.5-rc.dev

10 years agoforward-port 0.2.6.5-rc changelog.
Nick Mathewson [Wed, 18 Mar 2015 20:30:08 +0000 (16:30 -0400)] 
forward-port 0.2.6.5-rc changelog.

10 years agoMerge remote-tracking branch 'public/feature15053'
Nick Mathewson [Wed, 18 Mar 2015 18:27:00 +0000 (14:27 -0400)] 
Merge remote-tracking branch 'public/feature15053'

10 years agoMerge remote-tracking branch 'origin/maint-0.2.6'
Nick Mathewson [Wed, 18 Mar 2015 13:11:34 +0000 (09:11 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.6'

10 years agobump to 0.2.6.5-rc
Nick Mathewson [Wed, 18 Mar 2015 13:10:48 +0000 (09:10 -0400)] 
bump to 0.2.6.5-rc

10 years agoMerge remote-tracking branch 'origin/maint-0.2.6'
Nick Mathewson [Wed, 18 Mar 2015 12:58:15 +0000 (08:58 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.6'

10 years agoForward-port changelog and releasenotes
Nick Mathewson [Tue, 17 Mar 2015 14:54:38 +0000 (10:54 -0400)] 
Forward-port changelog and releasenotes

10 years agoMake log.o depend on micro-revision.i
Nick Mathewson [Sun, 15 Mar 2015 21:09:58 +0000 (17:09 -0400)] 
Make log.o depend on micro-revision.i

Otherwise micro-revision.i might not get built on time.

10 years agochanges file for 15024
Nick Mathewson [Sun, 15 Mar 2015 12:26:43 +0000 (08:26 -0400)] 
changes file for 15024

10 years agoBe consistent with capitalization, quoting, and spacing of help strings.
cypherpunks [Thu, 19 Feb 2015 08:34:14 +0000 (09:34 +0100)] 
Be consistent with capitalization, quoting, and spacing of help strings.

10 years agoSimplify the loop.
Nick Mathewson [Sat, 14 Mar 2015 18:30:08 +0000 (14:30 -0400)] 
Simplify the loop.

10 years agoAdd comments for new functions
Nick Mathewson [Sat, 14 Mar 2015 18:27:33 +0000 (14:27 -0400)] 
Add comments for new functions

10 years agoremove a needless "if (1)" that was there for indentation; fix indentation.
Nick Mathewson [Sat, 14 Mar 2015 18:25:37 +0000 (14:25 -0400)] 
remove a needless "if (1)" that was there for indentation; fix indentation.

10 years agoExtract main part of main loop into a separate function
Nick Mathewson [Sat, 14 Mar 2015 18:24:18 +0000 (14:24 -0400)] 
Extract main part of main loop into a separate function

For 15176; Shadow would like this.

Based on a patch by Rob Jansen, but revised to have a minimal-sized diff.

10 years agoLog version when LD_BUG is logged.
Nick Mathewson [Wed, 25 Feb 2015 15:29:52 +0000 (10:29 -0500)] 
Log version when LD_BUG is logged.

Closes ticket 15026.

10 years agoadd newly generated files to .gitignore
Nick Mathewson [Sat, 14 Mar 2015 17:04:03 +0000 (13:04 -0400)] 
add newly generated files to .gitignore

10 years agoRevive updateVersions.pl with `make update-versions`.
cypherpunks [Thu, 12 Mar 2015 08:28:41 +0000 (09:28 +0100)] 
Revive updateVersions.pl with `make update-versions`.

10 years agoDo not distribute common_sha1.i and or_sha1.i.
cypherpunks [Thu, 12 Mar 2015 08:04:28 +0000 (09:04 +0100)] 
Do not distribute common_sha1.i and or_sha1.i.

These files get generated automatically so there is need to include them in the
distribution.

10 years agoMake `check-docs` work from out-of-tree builds.
cypherpunks [Wed, 11 Mar 2015 09:47:13 +0000 (10:47 +0100)] 
Make `check-docs` work from out-of-tree builds.

10 years agoAdd changes file for 15053.
cypherpunks [Tue, 10 Mar 2015 13:30:17 +0000 (14:30 +0100)] 
Add changes file for 15053.

10 years agoWarn users trying to generate a coverage report when not configured as such.
cypherpunks [Thu, 5 Mar 2015 14:48:47 +0000 (15:48 +0100)] 
Warn users trying to generate a coverage report when not configured as such.

10 years agoStop updating versions on every execution of `./configure`.
cypherpunks [Fri, 27 Feb 2015 15:03:43 +0000 (16:03 +0100)] 
Stop updating versions on every execution of `./configure`.

10 years agoRemove relative paths to header files.
cypherpunks [Fri, 27 Feb 2015 14:24:21 +0000 (15:24 +0100)] 
Remove relative paths to header files.

The paths are already in the directory search path of the compiler therefore no
need to include them in the source code.

10 years agoClean up generated files.
cypherpunks [Wed, 25 Feb 2015 15:04:02 +0000 (16:04 +0100)] 
Clean up generated files.

Remove src/or/or_sha1.i and src/common/common_sha1.i on `make clean` and remove
the temporary micro-revision file when its no longer needed.

Additional changes;
- show a message when generating the micro-revision file.
- add the temporary micro revision file to the list of files to be removed on
  `make clean` just in case.
- fix indentation of the make rule to improve readability.

10 years agoUse output variables instead of relative paths.
cypherpunks [Tue, 17 Feb 2015 14:36:10 +0000 (15:36 +0100)] 
Use output variables instead of relative paths.

Fixes the following rules in out-of-tree builds;
- check-spaces
- check-docs
- check-logs
- Doxygen
- coverage-html

And cleans up additional directories;
- coverage_html
- doc/doxygen

10 years agoug. test, _then_ commit, nick.
Nick Mathewson [Sat, 14 Mar 2015 16:14:32 +0000 (12:14 -0400)] 
ug. test, _then_ commit, nick.

10 years agoDo not printf success messages when we are --quieted or --hushed.
Nick Mathewson [Sat, 14 Mar 2015 16:12:53 +0000 (12:12 -0400)] 
Do not printf success messages when we are --quieted or --hushed.

Fixes 14994. Calling this a bug on when --quiet and --hush began to have
their current behavior.

10 years agoconst-ify the new failure vars, and one old one
Nick Mathewson [Fri, 13 Mar 2015 13:41:49 +0000 (09:41 -0400)] 
const-ify the new failure vars, and one old one

10 years agoMerge remote-tracking branch 'sebastian/bug15211'
Nick Mathewson [Fri, 13 Mar 2015 13:39:04 +0000 (09:39 -0400)] 
Merge remote-tracking branch 'sebastian/bug15211'

10 years agoDon't init hs intro key as side effect of an assert
Sebastian Hahn [Thu, 12 Mar 2015 17:59:46 +0000 (18:59 +0100)] 
Don't init hs intro key as side effect of an assert

10 years agoDon't init control authchallenge nonce as assert side effect
Sebastian Hahn [Thu, 12 Mar 2015 17:56:48 +0000 (18:56 +0100)] 
Don't init control authchallenge nonce as assert side effect

Fixes part of bug 15211.

10 years agoMerge remote-tracking branch 'origin/maint-0.2.6'
Nick Mathewson [Thu, 12 Mar 2015 17:16:22 +0000 (13:16 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.6'

10 years agoMerge remote-tracking branch 'public/feature15212_026' into maint-0.2.6
Nick Mathewson [Thu, 12 Mar 2015 17:15:08 +0000 (13:15 -0400)] 
Merge remote-tracking branch 'public/feature15212_026' into maint-0.2.6

10 years agoMerge remote-tracking branch 'origin/maint-0.2.6'
Nick Mathewson [Thu, 12 Mar 2015 17:13:06 +0000 (13:13 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.6'

10 years agoInitialize the extorport auth cookie before launching PTs.
Yawning Angel [Thu, 12 Mar 2015 15:37:48 +0000 (15:37 +0000)] 
Initialize the extorport auth cookie before launching PTs.

PTs expect the auth cookie to be available immedieately after launch,
leading to a race condition when PTs opt to cache the extorport cookie
once immediately after startup.

Fixes #15240.

10 years agoAdded a comment to tor.service.in
Nick Mathewson [Thu, 12 Mar 2015 17:11:53 +0000 (13:11 -0400)] 
Added a comment to tor.service.in

This explains that if you change your torrc to do more, you might
need to change tor.service.in to allow it.  See #15195.

10 years agoMerge remote-tracking branch 'origin/maint-0.2.6'
Nick Mathewson [Thu, 12 Mar 2015 16:53:31 +0000 (12:53 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.6'

10 years agodon't init threads as side effect of assertion
Sebastian Hahn [Thu, 12 Mar 2015 16:52:37 +0000 (17:52 +0100)] 
don't init threads as side effect of assertion

Fixes part of bug 15211.

10 years agoMerge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
Nick Mathewson [Thu, 12 Mar 2015 16:50:41 +0000 (12:50 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6

("-s ours" merge to avoid taking reversion of #15064)

10 years agoRevert "Make TransProxyType ipfw work correctly"
Nick Mathewson [Thu, 12 Mar 2015 16:49:08 +0000 (12:49 -0400)] 
Revert "Make TransProxyType ipfw work correctly"

This reverts commit 681802817deb6fb93b95f8284856fd42f3556600.

(I didn't mean to backport this, but somehow I had based my branch
for #15205 on it.)

10 years agoMerge remote-tracking branch 'origin/maint-0.2.6'
Nick Mathewson [Thu, 12 Mar 2015 16:27:54 +0000 (12:27 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.6'

10 years agoMerge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
Nick Mathewson [Thu, 12 Mar 2015 16:27:42 +0000 (12:27 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6

10 years agoMerge remote-tracking branch 'public/bug15205_025' into maint-0.2.5
Nick Mathewson [Thu, 12 Mar 2015 16:27:25 +0000 (12:27 -0400)] 
Merge remote-tracking branch 'public/bug15205_025' into maint-0.2.5

10 years agoMerge remote-tracking branch 'origin/maint-0.2.6'
Nick Mathewson [Thu, 12 Mar 2015 15:37:56 +0000 (11:37 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.6'

10 years agoMerge branch 'bug15245_026' into maint-0.2.6
Nick Mathewson [Thu, 12 Mar 2015 15:37:02 +0000 (11:37 -0400)] 
Merge branch 'bug15245_026' into maint-0.2.6

10 years agoadd an explanatory comment
Nick Mathewson [Thu, 12 Mar 2015 15:28:18 +0000 (11:28 -0400)] 
add an explanatory comment

10 years agoAlso, add an assertion to assign_onionskin_to_cpuworker
Nick Mathewson [Thu, 12 Mar 2015 15:15:50 +0000 (11:15 -0400)] 
Also, add an assertion to assign_onionskin_to_cpuworker

10 years agoFix crash bug when calling cpuworkers_rotate_keyinfo on a client.
Nick Mathewson [Thu, 12 Mar 2015 15:13:57 +0000 (11:13 -0400)] 
Fix crash bug when calling cpuworkers_rotate_keyinfo on a client.

Fixes bug 15245; bugfix on 0.2.6.3-alpha. Thanks to anonym for reporting!

10 years agoMerge remote-tracking branch 'origin/maint-0.2.6'
Nick Mathewson [Thu, 12 Mar 2015 14:54:30 +0000 (10:54 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.6'

10 years agoMerge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
Nick Mathewson [Thu, 12 Mar 2015 14:54:13 +0000 (10:54 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6

10 years agoBump 025 version to 0.2.5.11
Nick Mathewson [Thu, 12 Mar 2015 14:52:09 +0000 (10:52 -0400)] 
Bump 025 version to 0.2.5.11

10 years agoMerge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
Nick Mathewson [Thu, 12 Mar 2015 14:51:08 +0000 (10:51 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5

10 years agoBump 0.2.4 version.
Nick Mathewson [Thu, 12 Mar 2015 14:50:15 +0000 (10:50 -0400)] 
Bump 0.2.4 version.

10 years agoMerge remote-tracking branch 'origin/maint-0.2.6'
Nick Mathewson [Thu, 12 Mar 2015 14:06:10 +0000 (10:06 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.6'

10 years agoMerge branch 'bug9495_redux_v2' into maint-0.2.6
Nick Mathewson [Thu, 12 Mar 2015 14:05:06 +0000 (10:05 -0400)] 
Merge branch 'bug9495_redux_v2' into maint-0.2.6

10 years agoUse PTHREAD_CREATE_DETACHED macro instead of 1: fix Solaris crash
Nick Mathewson [Thu, 12 Mar 2015 13:49:45 +0000 (09:49 -0400)] 
Use PTHREAD_CREATE_DETACHED macro instead of 1: fix Solaris crash

When calling pthread_attr_setdetachstate, we were using 1 as the
argument. But the pthreads documentation says that you have to say
PTHREAD_CREATE_DETACH, which on Solaris is apparently 0x40.  Calling
pthread_attr_setdetachstate with 1 crashes on Solaris with FLTBOUNDS.

(Because we're so late in the release cycle, I made the code define
PTHREAD_CREATE_DETACHED if it doesn't exist, so we aren't likely to
break any other platforms.)

This bug was introduced when we made threading mandatory in
0.2.6.1-alpha; previously, we had force-disabled threading on
Solaris.  See #9495 discussion.

10 years agoMerge remote-tracking branch 'origin/maint-0.2.6'
Nick Mathewson [Tue, 10 Mar 2015 14:10:44 +0000 (10:10 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.6'

10 years agoFix check-spaces
Nick Mathewson [Tue, 10 Mar 2015 14:10:35 +0000 (10:10 -0400)] 
Fix check-spaces

10 years agoAdd link protocol version counts to the heartbeat message
Nick Mathewson [Tue, 10 Mar 2015 14:07:41 +0000 (10:07 -0400)] 
Add link protocol version counts to the heartbeat message

Closes ticket 15212

10 years agoRemove one changes files from master (0.2.7) that already got merged into changelogs...
Nick Mathewson [Tue, 10 Mar 2015 12:46:21 +0000 (08:46 -0400)] 
Remove one changes files from master (0.2.7) that already got merged into changelogs for 0.2.6.4-rc

10 years agoRemove the changes files from master (0.2.7) that already got merged into changelogs...
Nick Mathewson [Tue, 10 Mar 2015 12:45:26 +0000 (08:45 -0400)] 
Remove the changes files from master (0.2.7) that already got merged into changelogs for 0.2.6.4-rc or earlier.

10 years agoforward-port the 0.2.6.4-0rc changelog
Nick Mathewson [Tue, 10 Mar 2015 12:40:13 +0000 (08:40 -0400)] 
forward-port the 0.2.6.4-0rc changelog

10 years agoWhoops; I somehow dropped 9321 from the changelog
Nick Mathewson [Tue, 10 Mar 2015 12:39:20 +0000 (08:39 -0400)] 
Whoops; I somehow dropped 9321 from the changelog

10 years agoMerge remote-tracking branch 'origin/maint-0.2.6'
Nick Mathewson [Tue, 10 Mar 2015 12:37:08 +0000 (08:37 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.6'

10 years agoMerge commit 'origin/maint-0.2.6^'
Nick Mathewson [Tue, 10 Mar 2015 12:36:53 +0000 (08:36 -0400)] 
Merge commit 'origin/maint-0.2.6^'

10 years agobump 0.2.6 to 0.2.6.4-rc-dev
Nick Mathewson [Tue, 10 Mar 2015 12:20:47 +0000 (08:20 -0400)] 
bump 0.2.6 to 0.2.6.4-rc-dev

10 years agoMerge remote-tracking branch 'public/bug15205_025' into maint-0.2.6
Nick Mathewson [Mon, 9 Mar 2015 23:47:12 +0000 (19:47 -0400)] 
Merge remote-tracking branch 'public/bug15205_025' into maint-0.2.6

10 years agoMerge remote-tracking branch 'origin/maint-0.2.6'
Nick Mathewson [Mon, 9 Mar 2015 20:25:41 +0000 (16:25 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.6'

10 years agoMerge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
Nick Mathewson [Mon, 9 Mar 2015 20:25:11 +0000 (16:25 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6

10 years agoMerge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
Nick Mathewson [Mon, 9 Mar 2015 20:24:44 +0000 (16:24 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5

10 years agoMerge remote-tracking branch 'karsten/geoip6-mar2015' into maint-0.2.4
Nick Mathewson [Mon, 9 Mar 2015 20:24:07 +0000 (16:24 -0400)] 
Merge remote-tracking branch 'karsten/geoip6-mar2015' into maint-0.2.4

10 years agoMerge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Nick Mathewson [Mon, 9 Mar 2015 20:23:55 +0000 (16:23 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

10 years agoUpdate geoip6 to the March 3 2015 database.
Karsten Loesing [Mon, 9 Mar 2015 20:11:52 +0000 (21:11 +0100)] 
Update geoip6 to the March 3 2015 database.

10 years agoUpdate geoip to the March 3 2015 database.
Karsten Loesing [Mon, 9 Mar 2015 20:09:44 +0000 (21:09 +0100)] 
Update geoip to the March 3 2015 database.

10 years agoDon't use checked strl{cat,cpy} on OSX.
Nick Mathewson [Mon, 9 Mar 2015 19:09:49 +0000 (15:09 -0400)] 
Don't use checked strl{cat,cpy} on OSX.

There is a bug in the overlap-checking in strlcat that can crash Tor
servers.  Fixes bug 15205; this is an OSX bug, not a Tor bug.

10 years agoMerge remote-tracking branch 'origin/maint-0.2.6'
Nick Mathewson [Mon, 9 Mar 2015 17:50:05 +0000 (13:50 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.6'

10 years agoWe actually merged this one a while ago.
Nick Mathewson [Mon, 9 Mar 2015 17:49:55 +0000 (13:49 -0400)] 
We actually merged this one a while ago.

10 years agoMerge remote-tracking branch 'origin/maint-0.2.6'
Nick Mathewson [Mon, 9 Mar 2015 17:24:26 +0000 (13:24 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.6'

10 years agoMerge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
Nick Mathewson [Mon, 9 Mar 2015 17:23:32 +0000 (13:23 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6

10 years agoRestore c89 in 0.2.5
Nick Mathewson [Mon, 9 Mar 2015 17:22:58 +0000 (13:22 -0400)] 
Restore c89 in 0.2.5

10 years agoMerge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
Nick Mathewson [Mon, 9 Mar 2015 17:21:20 +0000 (13:21 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6

10 years agoMerge remote-tracking branch 'public/bug14261_025' into maint-0.2.5
Nick Mathewson [Mon, 9 Mar 2015 17:17:20 +0000 (13:17 -0400)] 
Merge remote-tracking branch 'public/bug14261_025' into maint-0.2.5

10 years agoGETINFO bw-event-cache to get information on recent BW events
Nick Mathewson [Wed, 7 Jan 2015 16:37:23 +0000 (11:37 -0500)] 
GETINFO bw-event-cache to get information on recent BW events

Closes 14128; useful to regain functionality lost because of 13988.

10 years agoMerge remote-tracking branch 'public/bug13988_025' into maint-0.2.5
Nick Mathewson [Mon, 9 Mar 2015 17:12:54 +0000 (13:12 -0400)] 
Merge remote-tracking branch 'public/bug13988_025' into maint-0.2.5

10 years agoMerge remote-tracking branch 'public/bug15088_025' into maint-0.2.5
Nick Mathewson [Mon, 9 Mar 2015 17:09:50 +0000 (13:09 -0400)] 
Merge remote-tracking branch 'public/bug15088_025' into maint-0.2.5

10 years agoMerge remote-tracking branch 'origin/maint-0.2.6'
Nick Mathewson [Mon, 9 Mar 2015 17:08:20 +0000 (13:08 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.6'

10 years agoMerge remote-tracking branch 'public/feature15006_026' into maint-0.2.6
Nick Mathewson [Mon, 9 Mar 2015 17:05:27 +0000 (13:05 -0400)] 
Merge remote-tracking branch 'public/feature15006_026' into maint-0.2.6

10 years agoMerge remote-tracking branch 'origin/maint-0.2.6'
Nick Mathewson [Mon, 9 Mar 2015 15:14:03 +0000 (11:14 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.6'

10 years agoChanges file for 15188
Nick Mathewson [Mon, 9 Mar 2015 15:13:57 +0000 (11:13 -0400)] 
Changes file for 15188

10 years agotesting_common.c: avoid side-effects of tor_assert
Tom van der Woerdt [Sun, 8 Mar 2015 18:20:56 +0000 (19:20 +0100)] 
testing_common.c: avoid side-effects of tor_assert

10 years agoMerge remote-tracking branch 'origin/maint-0.2.6'
Nick Mathewson [Mon, 9 Mar 2015 15:10:04 +0000 (11:10 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.6'

10 years agoMerge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
Nick Mathewson [Mon, 9 Mar 2015 15:09:49 +0000 (11:09 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6

10 years agoMerge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
Nick Mathewson [Mon, 9 Mar 2015 15:09:30 +0000 (11:09 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5

10 years agoMerge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Nick Mathewson [Mon, 9 Mar 2015 15:08:57 +0000 (11:08 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4