]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
10 years agoStop accepting milliseconds in various directory contexts
Nick Mathewson [Fri, 19 Jul 2013 03:45:40 +0000 (23:45 -0400)] 
Stop accepting milliseconds in various directory contexts

Have clients and authorities both have new behavior, since the
fix for bug 11243 has gone in.  But make clients still accept
accept old bogus HSDir descriptors, to avoid fingerprinting trickery.

Fixes bug 9286.

11 years agoMerge remote-tracking branch 'public/bug7484'
Nick Mathewson [Wed, 12 Nov 2014 18:44:57 +0000 (13:44 -0500)] 
Merge remote-tracking branch 'public/bug7484'

Conflicts:
src/test/test_addr.c

11 years agoFix wide lines (from 13172)
Nick Mathewson [Wed, 12 Nov 2014 18:42:01 +0000 (13:42 -0500)] 
Fix wide lines (from 13172)

11 years agoReplace operators used as macro arguments with OP_XX macros
Nick Mathewson [Wed, 12 Nov 2014 18:28:07 +0000 (13:28 -0500)] 
Replace operators used as macro arguments with OP_XX macros

Part of fix for 13172

11 years agoMerge branch 'ticket13172'
Nick Mathewson [Wed, 12 Nov 2014 18:25:17 +0000 (13:25 -0500)] 
Merge branch 'ticket13172'

11 years agoReenhappy make check-spaces
Nick Mathewson [Wed, 12 Nov 2014 18:15:10 +0000 (13:15 -0500)] 
Reenhappy make check-spaces

11 years agoMerge remote-tracking branch 'rl1987/bug13644'
Nick Mathewson [Wed, 12 Nov 2014 18:12:14 +0000 (13:12 -0500)] 
Merge remote-tracking branch 'rl1987/bug13644'

11 years agotweak 9812 changes file
Nick Mathewson [Wed, 12 Nov 2014 15:28:33 +0000 (10:28 -0500)] 
tweak 9812 changes file

11 years agoMerge remote-tracking branch 'rl1987/bug9812'
Nick Mathewson [Wed, 12 Nov 2014 15:27:12 +0000 (10:27 -0500)] 
Merge remote-tracking branch 'rl1987/bug9812'

11 years agoMerge remote-tracking branch 'public/bug13698_024_v1'
Nick Mathewson [Wed, 12 Nov 2014 15:23:55 +0000 (10:23 -0500)] 
Merge remote-tracking branch 'public/bug13698_024_v1'

11 years agoRevise changes file
Nick Mathewson [Wed, 12 Nov 2014 15:23:24 +0000 (10:23 -0500)] 
Revise changes file

11 years agoAdding changes file for 13644.
rl1987 [Tue, 11 Nov 2014 19:01:30 +0000 (21:01 +0200)] 
Adding changes file for 13644.

11 years agoRenaming ROUTER_WAS_NOT_NEW to ROUTER_IS_ALREADY_KNOWN.
rl1987 [Tue, 11 Nov 2014 18:56:40 +0000 (20:56 +0200)] 
Renaming ROUTER_WAS_NOT_NEW to ROUTER_IS_ALREADY_KNOWN.

11 years agoComment possible values of was_router_added_t.
rl1987 [Tue, 11 Nov 2014 18:37:39 +0000 (20:37 +0200)] 
Comment possible values of was_router_added_t.

11 years agoFix: don't report timeout when closing parallel intro points
David Goulet [Mon, 10 Nov 2014 19:38:53 +0000 (14:38 -0500)] 
Fix: don't report timeout when closing parallel intro points

When closing parallel introduction points, the given reason (timeout)
was actually changed to "no reason" thus when the circuit purpose was
CIRCUIT_PURPOSE_C_INTRODUCE_ACK_WAIT, we were reporting an introduction
point failure and flagging it "unreachable". After three times, that
intro point gets removed from the rend cache object.

In the case of CIRCUIT_PURPOSE_C_INTRODUCING, the intro point was
flagged has "timed out" and thus not used until the connection to the HS
is closed where that flag gets reset.

This commit adds an internal circuit reason called
END_CIRC_REASON_IP_NOW_REDUNDANT which tells the closing circuit
mechanism to not report any intro point failure.

This has been observed while opening hundreds of connections to an HS on
different circuit for each connection. This fix makes this use case to
work like a charm.

Fixes #13698.

Signed-off-by: David Goulet <dgoulet@ev0ke.net>
11 years agoDocument networkstatus-bridges
Nick Mathewson [Mon, 10 Nov 2014 14:03:11 +0000 (09:03 -0500)] 
Document networkstatus-bridges

Closes 13713; patch from 'tom'

11 years agoAdding changes file for 9812.
rl1987 [Sun, 9 Nov 2014 15:55:35 +0000 (17:55 +0200)] 
Adding changes file for 9812.

11 years agoPrint a warning when extra info document is found incompatible with router descriptor.
rl1987 [Sun, 9 Nov 2014 15:41:18 +0000 (17:41 +0200)] 
Print a warning when extra info document is found incompatible with router descriptor.

11 years agoDowngrade RSA signature verification failure error message to info loglevel.
rl1987 [Sun, 9 Nov 2014 15:39:23 +0000 (17:39 +0200)] 
Downgrade RSA signature verification failure error message to info loglevel.

11 years agoFixing typo in manpage.
rl1987 [Sun, 9 Nov 2014 14:34:34 +0000 (16:34 +0200)] 
Fixing typo in manpage.

11 years agoWrong format in log statement
David Goulet [Fri, 7 Nov 2014 16:40:41 +0000 (11:40 -0500)] 
Wrong format in log statement

Fixes bug 13701.

11 years agotest_checkdir.c: Perhaps this is what will make this test pass on windows?
Nick Mathewson [Fri, 7 Nov 2014 14:28:49 +0000 (09:28 -0500)] 
test_checkdir.c: Perhaps this is what will make this test pass on windows?

11 years agotest_checkdir.c: try to make it pass on windows
Nick Mathewson [Fri, 7 Nov 2014 13:54:03 +0000 (08:54 -0500)] 
test_checkdir.c: try to make it pass on windows

also fix memory-leak on failing tests.

11 years agoDefine macros meaning <,>,==,!=,<=,>=
Nick Mathewson [Thu, 6 Nov 2014 16:19:31 +0000 (11:19 -0500)] 
Define macros meaning <,>,==,!=,<=,>=

This lets us avoid putting operators directly in macro arguments,
and thus will help us unconfuse coccinelle.

For ticket 13172.

11 years agoThrow identify-node-by-nickname down the memory hole
Nick Mathewson [Thu, 6 Nov 2014 16:10:58 +0000 (11:10 -0500)] 
Throw identify-node-by-nickname down the memory hole

Authorities are no longer voting on Named, so specifying nodes by
nickname isn't a clever thing to do.  (Not that it ever was!)  So
remove the documentation that suggests that you should do it.

Additionally, add proper cross-references to our __node__ lists, and
explain about the optional $ before identity digests.

Also, the oxford comma: endorsed by Steven Pinker, my spouse, and my
11th grade English teacher.

Closes 13381.

11 years agoTry to fix test_checkdir windows compilation more
Nick Mathewson [Wed, 5 Nov 2014 19:51:17 +0000 (14:51 -0500)] 
Try to fix test_checkdir windows compilation more

11 years agoTry to fix test_checkdir windows compilation
Nick Mathewson [Wed, 5 Nov 2014 19:39:09 +0000 (14:39 -0500)] 
Try to fix test_checkdir windows compilation

11 years agochgrp the testing tempdir to ourself to clear the sticky bit
Nick Mathewson [Wed, 5 Nov 2014 19:27:05 +0000 (14:27 -0500)] 
chgrp the testing tempdir to ourself to clear the sticky bit

Closes 13678.  Doesn't actually matter for older tors.

11 years ago11291: Fix warnings, add changes file, rename 'mask'.
Nick Mathewson [Wed, 5 Nov 2014 19:09:59 +0000 (14:09 -0500)] 
11291: Fix warnings, add changes file, rename 'mask'.

11 years agoMerge remote-tracking branch 'meejah/ticket-11291-extra-utests'
Nick Mathewson [Wed, 5 Nov 2014 19:11:47 +0000 (14:11 -0500)] 
Merge remote-tracking branch 'meejah/ticket-11291-extra-utests'

Conflicts:
src/or/config.c

11 years agoChanges file for Andrea's work on 6456
Nick Mathewson [Tue, 4 Nov 2014 14:59:25 +0000 (09:59 -0500)] 
Changes file for Andrea's work on 6456

11 years agoFix a wide line I introduced
Nick Mathewson [Tue, 4 Nov 2014 14:56:46 +0000 (09:56 -0500)] 
Fix a wide line I introduced

11 years agoFix unused-argument warnings
Nick Mathewson [Tue, 4 Nov 2014 14:54:51 +0000 (09:54 -0500)] 
Fix unused-argument warnings

11 years agoMerge remote-tracking branch 'andrea/ticket6456'
Nick Mathewson [Tue, 4 Nov 2014 14:49:35 +0000 (09:49 -0500)] 
Merge remote-tracking branch 'andrea/ticket6456'

Somewhat tricky conflicts:
src/or/config.c

Also, s/test_assert/tt_assert in test_config.c

11 years agoUpdate verbiage in README to mention autogen.sh
Nick Mathewson [Tue, 4 Nov 2014 14:01:46 +0000 (09:01 -0500)] 
Update verbiage in README to mention autogen.sh

Closes ticket 13190

11 years agoMerge branch 'bug13315_squashed'
Nick Mathewson [Tue, 4 Nov 2014 05:48:25 +0000 (00:48 -0500)] 
Merge branch 'bug13315_squashed'

Conflicts:
src/or/buffers.c

11 years agofix indentation
Nick Mathewson [Tue, 4 Nov 2014 05:46:32 +0000 (00:46 -0500)] 
fix indentation

11 years agoUse correct argument types for inet_pton.
Nick Mathewson [Tue, 4 Nov 2014 05:45:14 +0000 (00:45 -0500)] 
Use correct argument types for inet_pton.

(I blame whoever decided that using a void* for a union was a good
idea.)

11 years agoSending 'Not allowed' error message before closing the connection.
rl1987 [Tue, 21 Oct 2014 17:50:32 +0000 (20:50 +0300)] 
Sending 'Not allowed' error message before closing the connection.

11 years agoAdding changes file for 13315.
rl1987 [Tue, 14 Oct 2014 19:09:44 +0000 (22:09 +0300)] 
Adding changes file for 13315.

11 years agoChecking if FQDN is actually IPv6 address string and handling that case.
rl1987 [Tue, 14 Oct 2014 18:56:04 +0000 (21:56 +0300)] 
Checking if FQDN is actually IPv6 address string and handling that case.

11 years agoAdding helper function that checks if string is a valid IPv6 address.
rl1987 [Tue, 14 Oct 2014 18:53:48 +0000 (21:53 +0300)] 
Adding helper function that checks if string is a valid IPv6 address.

11 years agoValidating SOCKS5 hostname more correctly.
rl1987 [Sun, 12 Oct 2014 18:04:15 +0000 (21:04 +0300)] 
Validating SOCKS5 hostname more correctly.

11 years agoIntroducing helper function to validate IPv4 address strings.
rl1987 [Sun, 12 Oct 2014 17:39:00 +0000 (20:39 +0300)] 
Introducing helper function to validate IPv4 address strings.

11 years agoIntroducing helper function to validate DNS name strings.
rl1987 [Sun, 12 Oct 2014 16:33:08 +0000 (19:33 +0300)] 
Introducing helper function to validate DNS name strings.

11 years agoMerge remote-tracking branch 'public/bug13214_025_squashed'
Nick Mathewson [Tue, 4 Nov 2014 05:24:56 +0000 (00:24 -0500)] 
Merge remote-tracking branch 'public/bug13214_025_squashed'

11 years agoCheck descriptor ID in addition to HS ID when saving a v2 hs descriptor
Nick Mathewson [Mon, 3 Nov 2014 19:02:47 +0000 (14:02 -0500)] 
Check descriptor ID in addition to HS ID when saving a v2 hs descriptor

Fixes bug 13214; reported by 'special'.

11 years agoAdd comments and rename intro_nodes list in rend_services_introduce()
David Goulet [Tue, 4 Nov 2014 05:19:31 +0000 (00:19 -0500)] 
Add comments and rename intro_nodes list in rend_services_introduce()

(No changes file needed: this patch just adds comments and renames
variables. This is ticket 13646. message taken from the ticket. -Nick)

11 years agoUse tor_malloc_zero(x), not tor_calloc(x,sizeof(char))
Nick Mathewson [Sun, 2 Nov 2014 17:08:51 +0000 (12:08 -0500)] 
Use tor_malloc_zero(x), not tor_calloc(x,sizeof(char))

(Also, fixes a wide line.)

11 years agoMerge branch 'calloc2'
Nick Mathewson [Sun, 2 Nov 2014 17:03:11 +0000 (12:03 -0500)] 
Merge branch 'calloc2'

11 years agoApply new calloc coccinelle patch
Nick Mathewson [Sun, 2 Nov 2014 16:56:02 +0000 (11:56 -0500)] 
Apply new calloc coccinelle patch

11 years agoUse the | trick to save a comparison in our calloc check.
Nick Mathewson [Sun, 2 Nov 2014 16:48:08 +0000 (11:48 -0500)] 
Use the | trick to save a comparison in our calloc check.

11 years agoSwitch to a < comparison for our calloc check; explain how it works
Nick Mathewson [Sun, 2 Nov 2014 16:42:33 +0000 (11:42 -0500)] 
Switch to a < comparison for our calloc check; explain how it works

11 years agoDocument the calloc function overflow check.
Mansour Moufid [Sun, 19 Oct 2014 17:12:11 +0000 (13:12 -0400)] 
Document the calloc function overflow check.

11 years agoRemove a duplicate comment.
Mansour Moufid [Sun, 19 Oct 2014 16:59:28 +0000 (12:59 -0400)] 
Remove a duplicate comment.

11 years agoAdd a rule to the calloc semantic patch for argument ordering.
Mansour Moufid [Sun, 19 Oct 2014 16:36:46 +0000 (12:36 -0400)] 
Add a rule to the calloc semantic patch for argument ordering.

11 years agoThe second argument to tor_calloc should be a constant.
Mansour Moufid [Sun, 19 Oct 2014 16:20:36 +0000 (12:20 -0400)] 
The second argument to tor_calloc should be a constant.

Just like the conventional calloc.

11 years agoRefactor the calloc semantic patch.
Mansour Moufid [Sun, 19 Oct 2014 16:18:31 +0000 (12:18 -0400)] 
Refactor the calloc semantic patch.

This does not change its effects.

11 years agoRefactor the tor_reallocarray_ overflow check.
Mansour Moufid [Sun, 19 Oct 2014 16:11:53 +0000 (12:11 -0400)] 
Refactor the tor_reallocarray_ overflow check.

11 years agoRefactor the tor_calloc_ overflow check.
Mansour Moufid [Sun, 19 Oct 2014 16:04:26 +0000 (12:04 -0400)] 
Refactor the tor_calloc_ overflow check.

11 years agoMerge remote-tracking branch 'public/bug13399'
Nick Mathewson [Sat, 1 Nov 2014 21:04:04 +0000 (17:04 -0400)] 
Merge remote-tracking branch 'public/bug13399'

11 years agoUse digest256_len in networkstatus_copy_old_consensus_info()
Nick Mathewson [Fri, 31 Oct 2014 15:36:31 +0000 (11:36 -0400)] 
Use digest256_len in networkstatus_copy_old_consensus_info()

Now, if a router ever changes its microdescriptor, but the new
microdescriptor SHA256 hash has the same 160-bit prefix as the old
one, we treat it as a new microdescriptor when deciding whether to
copy status information.

(This function also is used to compare SHA1 digests of router
descriptors, but don't worry: the descriptor_digest field either holds
a SHA256 hash, or a SHA1 hash padded with 0 bytes.)

11 years agoUse digest256map for computing microdescriptor downloads
Nick Mathewson [Fri, 31 Oct 2014 15:32:32 +0000 (11:32 -0400)] 
Use digest256map for computing microdescriptor downloads

11 years agoMerge branch 'digest256map'
Nick Mathewson [Fri, 31 Oct 2014 15:15:49 +0000 (11:15 -0400)] 
Merge branch 'digest256map'

11 years agoRefactor {str,digest}map into a common implementation; add digest256map
Nick Mathewson [Fri, 31 Oct 2014 14:54:12 +0000 (10:54 -0400)] 
Refactor {str,digest}map into a common implementation; add digest256map

Needed for #13399.

11 years agoRepair format_changelog.py drupal breaks a little more. Drupal is weird.
Nick Mathewson [Fri, 31 Oct 2014 13:13:08 +0000 (09:13 -0400)] 
Repair format_changelog.py drupal breaks a little more. Drupal is weird.

11 years agoRe-run latest git trunnel to get fix from teor for #13577
Nick Mathewson [Fri, 31 Oct 2014 12:56:14 +0000 (08:56 -0400)] 
Re-run latest git trunnel to get fix from teor for #13577

11 years agoMerge commit '13298d90a90dc62d21d38f910171c9b57a8f0273'
Nick Mathewson [Fri, 31 Oct 2014 12:52:07 +0000 (08:52 -0400)] 
Merge commit '13298d90a90dc62d21d38f910171c9b57a8f0273'

11 years agoTeach format_changelog.py --blog about drupal <!--break-->
Nick Mathewson [Thu, 30 Oct 2014 21:08:42 +0000 (17:08 -0400)] 
Teach format_changelog.py --blog about drupal <!--break-->

11 years agoTwiddle the format_changelog.py option defaults.
Nick Mathewson [Thu, 30 Oct 2014 20:54:10 +0000 (16:54 -0400)] 
Twiddle the format_changelog.py option defaults.

11 years agoNew empty changelog section
Nick Mathewson [Thu, 30 Oct 2014 17:56:36 +0000 (13:56 -0400)] 
New empty changelog section

11 years agoBump version to 0.2.6.1-alpha-dev
Nick Mathewson [Thu, 30 Oct 2014 14:25:24 +0000 (10:25 -0400)] 
Bump version to 0.2.6.1-alpha-dev

11 years agoClarify 13476 changelog (From sebastian) tor-0.2.6.1-alpha
Nick Mathewson [Thu, 30 Oct 2014 13:56:40 +0000 (09:56 -0400)] 
Clarify 13476 changelog (From sebastian)

11 years agoFix a typo in the ChangeLog, spotted by Yawning
Nick Mathewson [Thu, 30 Oct 2014 13:52:36 +0000 (09:52 -0400)] 
Fix a typo in the ChangeLog, spotted by Yawning

11 years agoBump version to 0.2.6.1-alpha
Nick Mathewson [Thu, 30 Oct 2014 12:58:58 +0000 (08:58 -0400)] 
Bump version to 0.2.6.1-alpha

11 years agoFinal(?) tweaks to 0.2.6.1-alpha changelog
Nick Mathewson [Thu, 30 Oct 2014 12:54:44 +0000 (08:54 -0400)] 
Final(?) tweaks to 0.2.6.1-alpha changelog

11 years agoSilence spurious clang warnings
teor [Sun, 26 Oct 2014 03:43:55 +0000 (14:43 +1100)] 
Silence spurious clang warnings

Silence clang warnings under --enable-expensive-hardening, including:
  + implicit truncation of 64 bit values to 32 bit;
  + const char assignment to self;
  + tautological compare; and
  + additional parentheses around equality tests. (gcc uses these to
    silence assignment, so clang warns when they're present in an
    equality test. But we need to use extra parentheses in macros to
    isolate them from other code).

11 years agoMake 0.2.6.1-alpha ChangeLog prettier.
George Kadianakis [Wed, 29 Oct 2014 17:26:26 +0000 (17:26 +0000)] 
Make 0.2.6.1-alpha ChangeLog prettier.

11 years agoAdd a draft blurb for 0.2.6.1-alpha
Nick Mathewson [Wed, 29 Oct 2014 14:24:13 +0000 (10:24 -0400)] 
Add a draft blurb for 0.2.6.1-alpha

11 years agoReinvoke format_changelog.py
Nick Mathewson [Wed, 29 Oct 2014 14:19:10 +0000 (10:19 -0400)] 
Reinvoke format_changelog.py

Also, tweak it so that it puts major deprecations and requirements
early in the changelog.

11 years agoa few more style fixes for the changelog
Nick Mathewson [Wed, 29 Oct 2014 14:18:48 +0000 (10:18 -0400)] 
a few more style fixes for the changelog

11 years agoEdit changelog entries for terseness and style.
Nick Mathewson [Wed, 29 Oct 2014 14:17:27 +0000 (10:17 -0400)] 
Edit changelog entries for terseness and style.

11 years agoAdd in a few more changes entries for 0.2.6.1-alpha
Nick Mathewson [Wed, 29 Oct 2014 13:06:55 +0000 (09:06 -0400)] 
Add in a few more changes entries for 0.2.6.1-alpha

(Also resort and rewrap)

11 years agoTrack down "bugfix on version" entries for 0.2.6.1-alpha changelog
Nick Mathewson [Wed, 29 Oct 2014 12:50:13 +0000 (08:50 -0400)] 
Track down "bugfix on version" entries for 0.2.6.1-alpha changelog

11 years agoAdd another year to our copyright dates.
Nick Mathewson [Tue, 28 Oct 2014 19:28:14 +0000 (15:28 -0400)] 
Add another year to our copyright dates.

Because in 95 years, we or our successors will surely care about
enforcing the BSD license terms on this code.  Right?

11 years agoAdding changes file for 9708.
rl1987 [Sun, 26 Oct 2014 17:48:22 +0000 (19:48 +0200)] 
Adding changes file for 9708.

11 years agoInitial version of doc/TUNING.
rl1987 [Sun, 26 Oct 2014 17:37:48 +0000 (19:37 +0200)] 
Initial version of doc/TUNING.

11 years agoUpdating message that warns about running out of sockets we can use.
rl1987 [Sun, 26 Oct 2014 14:45:15 +0000 (16:45 +0200)] 
Updating message that warns about running out of sockets we can use.

11 years agoFix smartlist_choose_node_by_bandwidth() so that it rejects ORs with BadExit flag.
rl1987 [Sun, 26 Oct 2014 18:56:15 +0000 (20:56 +0200)] 
Fix smartlist_choose_node_by_bandwidth() so that it rejects ORs with BadExit flag.

11 years agoMerge remote-tracking branch 'rl1987/feature10427'
Nick Mathewson [Tue, 28 Oct 2014 18:03:40 +0000 (14:03 -0400)] 
Merge remote-tracking branch 'rl1987/feature10427'

11 years agoMerge remote-tracking branch 'sebastian/bug13286'
Nick Mathewson [Mon, 27 Oct 2014 16:12:16 +0000 (12:12 -0400)] 
Merge remote-tracking branch 'sebastian/bug13286'

11 years agoStart on an 0.2.6.1-alpha changelog
Nick Mathewson [Mon, 27 Oct 2014 15:27:52 +0000 (11:27 -0400)] 
Start on an 0.2.6.1-alpha changelog

I concatenated the remaining changes/* files, removed them, made the
headings more uniform, then told format_changelog.py to sort,
collate, and wrap them.

11 years agoRemove changes files that have already been merged in release-0.2.5
Nick Mathewson [Mon, 27 Oct 2014 15:09:41 +0000 (11:09 -0400)] 
Remove changes files that have already been merged in release-0.2.5

(This means that changes/* is now "everything that changed since
0.2.5.10".)

11 years agoTeach format_changelog.py to emit HTML.
Nick Mathewson [Mon, 27 Oct 2014 14:32:25 +0000 (10:32 -0400)] 
Teach format_changelog.py to emit HTML.

11 years agoRemove configure option to disable curve25519
Sebastian Hahn [Mon, 27 Oct 2014 13:37:50 +0000 (14:37 +0100)] 
Remove configure option to disable curve25519

By now, support in the network is widespread and it's time to require
more modern crypto on all Tor instances, whether they're clients or
servers. By doing this early in 0.2.6, we can be sure that at some point
all clients will have reasonable support.

11 years agoCongratulate relay operator when OR is first started
rl1987 [Sun, 26 Oct 2014 19:51:35 +0000 (21:51 +0200)] 
Congratulate relay operator when OR is first started

When Tor first generates identity keypair, emit a log message that
thanks for their participation and points to new Tor relay lifecycle
document.

11 years agoFix a crash bug introduced in 223d354e3.
Nick Mathewson [Sun, 26 Oct 2014 18:09:03 +0000 (14:09 -0400)] 
Fix a crash bug introduced in 223d354e3.

Arma found this and commented on #11243.  Bug not in any released
version of Tor.

11 years agoMerge remote-tracking branch 'origin/maint-0.2.5'
Nick Mathewson [Fri, 24 Oct 2014 13:23:53 +0000 (09:23 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.5'

11 years agobump version to 0.2.5.10-dev
Nick Mathewson [Fri, 24 Oct 2014 13:22:58 +0000 (09:22 -0400)] 
bump version to 0.2.5.10-dev

11 years agoForward-port changelog and release notes for 0.2.5.10
Nick Mathewson [Fri, 24 Oct 2014 13:21:40 +0000 (09:21 -0400)] 
Forward-port changelog and release notes for 0.2.5.10