]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
7 years agoUpdate fallback whitelist and blacklist based on 2017 changes
Matt Traudt [Tue, 19 Dec 2017 23:27:25 +0000 (18:27 -0500)] 
Update fallback whitelist and blacklist based on 2017 changes

This covers #22321 comments 3-14, including some child tickets.

Part of #22321. Patch by pastly.

7 years agoUpdate comment and add changes file for 20942
teor [Fri, 22 Dec 2017 10:49:28 +0000 (21:49 +1100)] 
Update comment and add changes file for 20942

7 years agoSet CONSENSUS_EXPIRY_TOLERANCE to 0
Dominique Ingoglia [Tue, 19 Dec 2017 23:48:59 +0000 (16:48 -0700)] 
Set CONSENSUS_EXPIRY_TOLERANCE to 0

7 years agosmartlist.rs: The libc::c_char type is not the same as i8.
Nick Mathewson [Thu, 4 Jan 2018 17:20:54 +0000 (12:20 -0500)] 
smartlist.rs: The libc::c_char type is not the same as i8.

The code had been using c_char and i8 interchangeably, but it turns
out that c_char is only i8 on platforms where "char" is signed. On
other platforms, c_char is u8.

Fixes bug 24794; bug not on any released Tor.

7 years agoMerge remote-tracking branch 'frewsxcv/frewsxcv-protover-heap'
Nick Mathewson [Thu, 4 Jan 2018 16:05:53 +0000 (11:05 -0500)] 
Merge remote-tracking branch 'frewsxcv/frewsxcv-protover-heap'

7 years agoMerge remote-tracking branch 'pastly2/ticket24531_033_01'
Nick Mathewson [Wed, 3 Jan 2018 16:56:35 +0000 (11:56 -0500)] 
Merge remote-tracking branch 'pastly2/ticket24531_033_01'

7 years agoIn networkstatus_consensus_has_ipv6 test, use approx_time()
Nick Mathewson [Wed, 3 Jan 2018 15:57:44 +0000 (10:57 -0500)] 
In networkstatus_consensus_has_ipv6 test, use approx_time()

This may (or may not) fix up some reliability issues we've been
seeing with this test on windows.

7 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Wed, 3 Jan 2018 15:09:20 +0000 (10:09 -0500)] 
Merge branch 'maint-0.3.2'

7 years agoMerge branch 'bug24634' into maint-0.3.2
Nick Mathewson [Wed, 3 Jan 2018 15:08:36 +0000 (10:08 -0500)] 
Merge branch 'bug24634' into maint-0.3.2

7 years agoFix some shadowed-global warnings.
Nick Mathewson [Wed, 3 Jan 2018 14:13:00 +0000 (09:13 -0500)] 
Fix some shadowed-global warnings.

These are all about local variables shadowing global
functions. That isn't normally a problem, but at least one
compiler we care about seems to treat this as a case of -Wshadow
violation, so let's fix it.

Fixes bug 24634; bugfix on 0.3.2.1-alpha.

7 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Wed, 3 Jan 2018 14:00:00 +0000 (09:00 -0500)] 
Merge branch 'maint-0.3.2'

7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Wed, 3 Jan 2018 14:00:00 +0000 (09:00 -0500)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

7 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Wed, 3 Jan 2018 13:59:59 +0000 (08:59 -0500)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Wed, 3 Jan 2018 13:59:59 +0000 (08:59 -0500)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

7 years agoMerge branch 'bug24633_029' into maint-0.2.9
Nick Mathewson [Wed, 3 Jan 2018 13:59:52 +0000 (08:59 -0500)] 
Merge branch 'bug24633_029' into maint-0.2.9

7 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Tue, 2 Jan 2018 19:42:31 +0000 (14:42 -0500)] 
Merge branch 'maint-0.3.2'

7 years agoMerge remote-tracking branch 'teor/bug24703_032' into maint-0.3.2
Nick Mathewson [Tue, 2 Jan 2018 19:42:27 +0000 (14:42 -0500)] 
Merge remote-tracking branch 'teor/bug24703_032' into maint-0.3.2

7 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Tue, 2 Jan 2018 15:10:28 +0000 (10:10 -0500)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Tue, 2 Jan 2018 15:10:28 +0000 (10:10 -0500)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

7 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Tue, 2 Jan 2018 15:10:28 +0000 (10:10 -0500)] 
Merge branch 'maint-0.3.2'

7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Tue, 2 Jan 2018 15:10:28 +0000 (10:10 -0500)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

7 years agoMerge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9
Nick Mathewson [Tue, 2 Jan 2018 15:09:44 +0000 (10:09 -0500)] 
Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9

7 years agoMerge remote-tracking branch 'teor/ticket24001'
Nick Mathewson [Tue, 2 Jan 2018 15:07:13 +0000 (10:07 -0500)] 
Merge remote-tracking branch 'teor/ticket24001'

7 years agoRemove changes file for 24762
Nick Mathewson [Tue, 2 Jan 2018 14:55:29 +0000 (09:55 -0500)] 
Remove changes file for 24762

(Bugfixes for bugs not in any released Tor don't get listed in the
changelog, and therefore don't need changes files.)

7 years agoMerge remote-tracking branch 'teor/bug24762'
Nick Mathewson [Tue, 2 Jan 2018 14:54:56 +0000 (09:54 -0500)] 
Merge remote-tracking branch 'teor/bug24762'

7 years agoMerge remote-tracking branch 'ffmancera/github/bug24677'
Nick Mathewson [Tue, 2 Jan 2018 14:37:23 +0000 (09:37 -0500)] 
Merge remote-tracking branch 'ffmancera/github/bug24677'

7 years agoUse ping -6 ::1 on Linux when ping6 ::1 fails on tests.
Fernando Fernandez Mancera [Tue, 2 Jan 2018 14:18:36 +0000 (15:18 +0100)] 
Use ping -6 ::1 on Linux when ping6 ::1 fails on tests.

Tor test now checks if "ping -6 -c 1 -W 1 ::1" works when "ping6 -c 1 -W 1 ::1"
fails on tests.

Fixes #24677; bugfix in 0.2.9.3-alpha.

Signed-off-by: Fernando Fernandez Mancera <ffernandezmancera@gmail.com>
7 years agoStop trying to remove NULL filenames on shutdown
teor [Fri, 29 Dec 2017 12:00:57 +0000 (23:00 +1100)] 
Stop trying to remove NULL filenames on shutdown

Fixes bug 24762; bugfix on master.
(Not in any released version of Tor.)

7 years ago[fixup] this might be an improvement?
Corey Farwell [Fri, 29 Dec 2017 02:17:45 +0000 (18:17 -0800)] 
[fixup] this might be an improvement?

7 years agoRemove unneeded heap allocations in protover.rs.
Corey Farwell [Thu, 28 Dec 2017 06:05:06 +0000 (22:05 -0800)] 
Remove unneeded heap allocations in protover.rs.

7 years agoClear the address when we can't choose a reachable address
teor [Sun, 24 Dec 2017 14:53:14 +0000 (01:53 +1100)] 
Clear the address when we can't choose a reachable address

When the fascist_firewall_choose_address_ functions don't find a
reachable address, set the returned address to the null address and port.

This is a precautionary measure, because some callers do not check the
return value.

Fixes bug 24736; bugfix on 0.2.8.2-alpha.

7 years agoExpand comments in node_get_ed25519_id() and put them near the relevant code
teor [Sun, 24 Dec 2017 08:47:42 +0000 (19:47 +1100)] 
Expand comments in node_get_ed25519_id() and put them near the relevant code

And add a changes file.

Follow-up to 24001.

7 years agoConditional check added
ArunaMaurya221B [Fri, 22 Dec 2017 10:45:42 +0000 (16:15 +0530)] 
Conditional check added

7 years agoBump the dates and Tor versions on the sample torrcs
teor [Fri, 22 Dec 2017 00:22:48 +0000 (11:22 +1100)] 
Bump the dates and Tor versions on the sample torrcs

7 years agoClarify the OutboundBindAddressOR documentation in the sample torrc
teor [Fri, 22 Dec 2017 00:22:10 +0000 (11:22 +1100)] 
Clarify the OutboundBindAddressOR documentation in the sample torrc

Part of 22145

7 years agoDocument IPv6Exit in the sample torrcs
teor [Fri, 22 Dec 2017 00:10:30 +0000 (11:10 +1100)] 
Document IPv6Exit in the sample torrcs

Sample config-only change.

Implements 24703.

7 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Thu, 21 Dec 2017 19:22:58 +0000 (14:22 -0500)] 
Merge branch 'maint-0.3.2'

"ours" to avoid version bump.

7 years agoIncrement version to 0.3.2.8-rc-dev
Nick Mathewson [Thu, 21 Dec 2017 19:22:54 +0000 (14:22 -0500)] 
Increment version to 0.3.2.8-rc-dev

7 years agoforward-port the 0.3.2.8-rc changelog
Nick Mathewson [Thu, 21 Dec 2017 19:22:30 +0000 (14:22 -0500)] 
forward-port the 0.3.2.8-rc changelog

7 years agoscan-build: Replace some test-assertions with fatal assertions
Nick Mathewson [Thu, 21 Dec 2017 18:26:57 +0000 (13:26 -0500)] 
scan-build: Replace some test-assertions with fatal assertions

Using tt_assert in these helpers was implying to scan-build that our
'new' functions might be returning NULL, which in turn would make it
warn about null-pointer use.

7 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Thu, 21 Dec 2017 17:42:11 +0000 (12:42 -0500)] 
Merge branch 'maint-0.3.2'

"ours" merge to avoid version bump.

7 years agoIncrement version to 0.3.2.8-rc
Nick Mathewson [Thu, 21 Dec 2017 17:42:00 +0000 (12:42 -0500)] 
Increment version to 0.3.2.8-rc

7 years agoremove changes files that appear in 0.3.2.8-rc
Nick Mathewson [Thu, 21 Dec 2017 17:41:25 +0000 (12:41 -0500)] 
remove changes files that appear in 0.3.2.8-rc

7 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Thu, 21 Dec 2017 16:16:00 +0000 (11:16 -0500)] 
Merge branch 'maint-0.3.2'

7 years agoMerge remote-tracking branch 'dgoulet/bug24671_032_01' into maint-0.3.2
Nick Mathewson [Thu, 21 Dec 2017 16:13:33 +0000 (11:13 -0500)] 
Merge remote-tracking branch 'dgoulet/bug24671_032_01' into maint-0.3.2

7 years agoFix a compilation error in the channel tests.
Nick Mathewson [Thu, 21 Dec 2017 16:10:30 +0000 (11:10 -0500)] 
Fix a compilation error in the channel tests.

This would only show up on systems like windows where monotime_t and
monotime_coarse_t are different types.

7 years agoIn 0.3.3, we use timestamps, not absolute milliseconds.
Nick Mathewson [Thu, 21 Dec 2017 15:57:45 +0000 (10:57 -0500)] 
In 0.3.3, we use timestamps, not absolute milliseconds.

7 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Thu, 21 Dec 2017 15:54:05 +0000 (10:54 -0500)] 
Merge branch 'maint-0.3.2'

7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Thu, 21 Dec 2017 15:50:33 +0000 (10:50 -0500)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

7 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Thu, 21 Dec 2017 15:50:06 +0000 (10:50 -0500)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Thu, 21 Dec 2017 15:49:40 +0000 (10:49 -0500)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

7 years agoUse monotime_coarse_absolute_msec() in destroy queue
Nick Mathewson [Thu, 21 Dec 2017 15:48:37 +0000 (10:48 -0500)] 
Use monotime_coarse_absolute_msec() in destroy queue

This way it will match the insert queue in 029 and later.

7 years agoMerge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Thu, 21 Dec 2017 15:43:12 +0000 (10:43 -0500)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

7 years agoMerge branch 'maint-0.2.5' into maint-0.2.8 maint-0.2.8
Nick Mathewson [Thu, 21 Dec 2017 15:43:06 +0000 (10:43 -0500)] 
Merge branch 'maint-0.2.5' into maint-0.2.8

7 years agoMerge branch 'bug24666_squashed_025' into maint-0.2.5
Nick Mathewson [Thu, 21 Dec 2017 15:40:10 +0000 (10:40 -0500)] 
Merge branch 'bug24666_squashed_025' into maint-0.2.5

7 years agoMove free to end of test function so coverity won't complain.
Nick Mathewson [Thu, 21 Dec 2017 15:39:29 +0000 (10:39 -0500)] 
Move free to end of test function so coverity won't complain.

7 years agoMove destroy cells into a separate queue type of their own, to save RAM
Nick Mathewson [Tue, 19 Dec 2017 18:53:52 +0000 (13:53 -0500)] 
Move destroy cells into a separate queue type of their own, to save RAM

We've been seeing problems with destroy cells queues taking up a
huge amount of RAM.  We can mitigate this, since while a full packed
destroy cell takes 514 bytes, we only need 5 bytes to remember a
circuit ID and a reason.

Fixes bug 24666. Bugfix on 0.2.5.1-alpha, when destroy cell queues
were introduced.

7 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Thu, 21 Dec 2017 15:27:39 +0000 (10:27 -0500)] 
Merge branch 'maint-0.3.2'

7 years agoclarify a comment
Nick Mathewson [Thu, 21 Dec 2017 15:27:37 +0000 (10:27 -0500)] 
clarify a comment

7 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Thu, 21 Dec 2017 15:20:35 +0000 (10:20 -0500)] 
Merge branch 'maint-0.3.2'

7 years agosched: Consider extra_space even if negative in KIST
David Goulet [Tue, 19 Dec 2017 21:20:36 +0000 (16:20 -0500)] 
sched: Consider extra_space even if negative in KIST

With extra_space negative, it means that the "notsent" queue is quite large so
we must consider that value with the current computed tcp_space. If we end up
to have negative space, we should not add more data to the kernel since the
notsent queue is just too filled up.

Fixes #24665

Signed-off-by: David Goulet <dgoulet@torproject.org>
7 years agoFix a pair of memory leaks in tor_cleanup()
Nick Mathewson [Thu, 21 Dec 2017 13:50:41 +0000 (08:50 -0500)] 
Fix a pair of memory leaks in tor_cleanup()

Spotted by coverity scan as 1426749 and 1426750

Bug not in any released Tor.

7 years agotype error fix for monotime_coarse_add_msec on windows
Nick Mathewson [Wed, 20 Dec 2017 22:45:59 +0000 (17:45 -0500)] 
type error fix for monotime_coarse_add_msec on windows

7 years agosched: Use lower layer cell limit with KISTLite
David Goulet [Wed, 20 Dec 2017 19:14:02 +0000 (14:14 -0500)] 
sched: Use lower layer cell limit with KISTLite

Instead of using INT_MAX as a write limit for KISTLite, use the lower layer
limit which is using the specialized num_cells_writeable() of the channel that
will down the line check the connection's outbuf and limit it to 32KB
(OR_CONN_HIGHWATER).

That way we don't take the chance of bloating the connection's outbuf and we
keep the cells in the circuit queue which our OOM handler can take care of,
not the outbuf.

Finally, this commit adds a log_debug() in the update socket information
function of KIST so we can get the socket information in debug.

Fixes #24671

Signed-off-by: David Goulet <dgoulet@torproject.org>
7 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Wed, 20 Dec 2017 17:15:24 +0000 (12:15 -0500)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Wed, 20 Dec 2017 17:15:24 +0000 (12:15 -0500)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Wed, 20 Dec 2017 17:15:24 +0000 (12:15 -0500)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

7 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Wed, 20 Dec 2017 17:15:24 +0000 (12:15 -0500)] 
Merge branch 'maint-0.3.2'

7 years agoMerge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Wed, 20 Dec 2017 17:15:23 +0000 (12:15 -0500)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

7 years agoMerge branch 'maint-0.2.5' into maint-0.2.8
Nick Mathewson [Wed, 20 Dec 2017 17:15:23 +0000 (12:15 -0500)] 
Merge branch 'maint-0.2.5' into maint-0.2.8

7 years agoUpdate geoip and geoip6 to the December 6 2017 database.
Karsten Loesing [Wed, 20 Dec 2017 16:36:29 +0000 (17:36 +0100)] 
Update geoip and geoip6 to the December 6 2017 database.

7 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Wed, 20 Dec 2017 16:19:23 +0000 (11:19 -0500)] 
Merge branch 'maint-0.3.2'

7 years agoMerge branch 'stack_again_032' into maint-0.3.2
Nick Mathewson [Wed, 20 Dec 2017 16:19:18 +0000 (11:19 -0500)] 
Merge branch 'stack_again_032' into maint-0.3.2

7 years agoMerge remote-tracking branch 'ahf-oniongit/bugs/24605'
Nick Mathewson [Wed, 20 Dec 2017 16:16:17 +0000 (11:16 -0500)] 
Merge remote-tracking branch 'ahf-oniongit/bugs/24605'

7 years agoexpand documentation on tor_remove_file
Nick Mathewson [Wed, 20 Dec 2017 15:43:27 +0000 (10:43 -0500)] 
expand documentation on tor_remove_file

7 years agoRemove pre-unlink check tor_remove_file; check errno instead.
Nick Mathewson [Wed, 20 Dec 2017 15:42:02 +0000 (10:42 -0500)] 
Remove pre-unlink check tor_remove_file; check errno instead.

This removes a time-of-check/time-of-use issue, though in this case
it would probably be harmless.

7 years agoMerge remote-tracking branch 'ffmancera/github/bug23271'
Nick Mathewson [Wed, 20 Dec 2017 15:40:32 +0000 (10:40 -0500)] 
Merge remote-tracking branch 'ffmancera/github/bug23271'

7 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Wed, 20 Dec 2017 15:39:38 +0000 (10:39 -0500)] 
Merge branch 'maint-0.3.2'

7 years agoUpdate the unit tests to reflect the change of 24425
Nick Mathewson [Wed, 20 Dec 2017 15:39:19 +0000 (10:39 -0500)] 
Update the unit tests to reflect the change of 24425

7 years agoRemove merge-conflict detritus
Nick Mathewson [Wed, 20 Dec 2017 15:15:00 +0000 (10:15 -0500)] 
Remove merge-conflict detritus

7 years agoMerge remote-tracking branch 'teor/ticket24682'
Nick Mathewson [Wed, 20 Dec 2017 15:14:43 +0000 (10:14 -0500)] 
Merge remote-tracking branch 'teor/ticket24682'

7 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Wed, 20 Dec 2017 14:59:51 +0000 (09:59 -0500)] 
Merge branch 'maint-0.3.2'

7 years agoMerge remote-tracking branch 'dgoulet/ticket24425_032_01' into maint-0.3.2
Nick Mathewson [Wed, 20 Dec 2017 14:59:06 +0000 (09:59 -0500)] 
Merge remote-tracking branch 'dgoulet/ticket24425_032_01' into maint-0.3.2

7 years agoFix the clz32 and clz64 settings on MSVC.
Nick Mathewson [Wed, 20 Dec 2017 14:34:25 +0000 (09:34 -0500)] 
Fix the clz32 and clz64 settings on MSVC.

Fixes bug 24633; bugfix on 0.2.9.1-alpha.

7 years agowhitespace fix
Nick Mathewson [Wed, 20 Dec 2017 14:17:13 +0000 (09:17 -0500)] 
whitespace fix

7 years agoMerge branch 'xfer_time_coarse'
Nick Mathewson [Wed, 20 Dec 2017 14:15:30 +0000 (09:15 -0500)] 
Merge branch 'xfer_time_coarse'

7 years agoImprove add_msec test to cover ms->sec rollover
Nick Mathewson [Wed, 20 Dec 2017 14:12:38 +0000 (09:12 -0500)] 
Improve add_msec test to cover ms->sec rollover

Per mikeperry's suggestion, I'm making sure that the millisecond
part of the time will always roll over in this test.

7 years agoMake fallback script usage instructions create a log file
teor [Wed, 20 Dec 2017 01:36:31 +0000 (12:36 +1100)] 
Make fallback script usage instructions create a log file

Comment-only change.

Closes 24682.

7 years agofinish documentation on live_consensus_is_missing
Nick Mathewson [Mon, 18 Dec 2017 20:00:48 +0000 (15:00 -0500)] 
finish documentation on live_consensus_is_missing

7 years agoAdd MainloopStats option.
Alexander Færøy [Sat, 16 Dec 2017 01:41:21 +0000 (02:41 +0100)] 
Add MainloopStats option.

This patch adds support for MainloopStats that allow developers to get
main event loop statistics via Tor's heartbeat status messages. The new
status log message will show how many succesful, erroneous, and idle
event loop iterations we have had.

See: https://bugs.torproject.org/24605

7 years agoFix additional whitespace in config module comment.
Alexander Færøy [Sat, 16 Dec 2017 01:22:37 +0000 (02:22 +0100)] 
Fix additional whitespace in config module comment.

7 years agoplease lintchanges
Nick Mathewson [Fri, 15 Dec 2017 17:53:01 +0000 (12:53 -0500)] 
please lintchanges

7 years agoindentation fix
Nick Mathewson [Fri, 15 Dec 2017 17:37:15 +0000 (12:37 -0500)] 
indentation fix

7 years agoAdd remove file function and remove ephemeral files.
Fernando Fernandez Mancera [Fri, 15 Dec 2017 16:01:22 +0000 (17:01 +0100)] 
Add remove file function and remove ephemeral files.

Adding tor_remove_file(filename) and refactoring tor_cleanup().

Removing CookieAuthFile and ExtORPortCookieAuthFile when tor_cleanup() is
called.

Fixes #23271.

Signed-off-by: Fernando Fernandez Mancera <ffernandezmancera@gmail.com>
7 years agoMerge remote-tracking branch 'isis/bug24612'
Nick Mathewson [Fri, 15 Dec 2017 15:59:57 +0000 (10:59 -0500)] 
Merge remote-tracking branch 'isis/bug24612'

7 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Thu, 14 Dec 2017 19:12:41 +0000 (14:12 -0500)] 
Merge branch 'maint-0.3.2'

"ours" merge to avoid version bump

7 years agobump to 0.3.2.7-rc-dev
Nick Mathewson [Thu, 14 Dec 2017 19:12:31 +0000 (14:12 -0500)] 
bump to 0.3.2.7-rc-dev

7 years agoforward-port the 0.3.2.7-rc changelog
Nick Mathewson [Thu, 14 Dec 2017 19:07:04 +0000 (14:07 -0500)] 
forward-port the 0.3.2.7-rc changelog

7 years agoremove changes files that will appear in 0.3.2.7-rc
Nick Mathewson [Wed, 13 Dec 2017 17:08:52 +0000 (12:08 -0500)] 
remove changes files that will appear in 0.3.2.7-rc

7 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Wed, 13 Dec 2017 17:07:46 +0000 (12:07 -0500)] 
Merge branch 'maint-0.3.2'